diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ArtistRowAdapter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ArtistRowAdapter.kt
index 5c289c8b..28105012 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ArtistRowAdapter.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ArtistRowAdapter.kt
@@ -143,7 +143,13 @@ class ArtistRowAdapter(
     }
 
     override fun getSectionName(position: Int): String {
-        return getSectionFromName(artistList[position].name ?: " ")
+        var listPosition = if (shouldShowHeader) position - 1 else position
+
+        // Show the first artist's initial in the popup when the list is
+        // scrolled up to the "Select Folder" row
+        if (listPosition < 0) listPosition = 0
+
+        return getSectionFromName(artistList[listPosition].name ?: " ")
     }
 
     private fun getSectionForArtist(artistPosition: Int): String {