diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/components/CollectionFolderList.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/components/CollectionFolderList.kt
index e82d87a5..3ae9085f 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/components/CollectionFolderList.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/components/CollectionFolderList.kt
@@ -103,9 +103,11 @@ fun CollectionFolderList(
 
     fun jumpTo(newPosition: Int) {
         scope.launch {
-            position = newPosition
-            listState.animateScrollToItem(newPosition)
-            positionFocusRequester.tryRequestFocus()
+            if (newPosition >= 0) {
+                position = newPosition
+                listState.animateScrollToItem(newPosition)
+                positionFocusRequester.tryRequestFocus()
+            }
         }
     }
 
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/CardGrid.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/CardGrid.kt
index 6587c626..32c4a64a 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/CardGrid.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/CardGrid.kt
@@ -515,7 +515,7 @@ fun AlphabetButtons(
     val scope = rememberCoroutineScope()
     val listState = rememberLazyListState()
 
-    val index = letters.indexOf(currentLetter)
+    val index = remember(letters, currentLetter) { letters.indexOf(currentLetter) }
     LaunchedEffect(currentLetter) {
         scope.launch(ExceptionHandler()) {
             val firstVisibleItemIndex = listState.firstVisibleItemIndex
@@ -523,7 +523,7 @@ fun AlphabetButtons(
                 listState.layoutInfo.visibleItemsInfo
                     .lastOrNull()
                     ?.index ?: -1
-            if (index !in firstVisibleItemIndex..lastVisibleItemIndex) {
+            if (index >= 0 && index !in firstVisibleItemIndex..lastVisibleItemIndex) {
                 listState.animateScrollToItem(index)
             }
         }
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/LyricsContent.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/LyricsContent.kt
index 6ccea46e..40dd5a87 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/LyricsContent.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/LyricsContent.kt
@@ -58,7 +58,7 @@ fun LyricsContent(
         LaunchedEffect(currentLyricPosition) {
             if (currentLyricPosition != null) {
                 listState.layoutInfo.visibleItemsInfo.lastOrNull()?.index?.let {
-                    if (currentLyricPosition !in listState.firstVisibleItemIndex..it) {
+                    if (currentLyricPosition >= 0 && currentLyricPosition !in listState.firstVisibleItemIndex..it) {
                         listState.animateScrollToItem(currentLyricPosition)
                     }
                 }