diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt
index 74d94870..fad008e6 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt
@@ -128,7 +128,11 @@ private fun BasicUnitListScreen(
          */
         viewModel.setSelectedChip(currentUnit.group)
         viewModel.loadUnitsToShow(noBrokenCurrencies)
-        chipsRowLazyListState.animateScrollToItem(uiState.shownUnitGroups.indexOf(currentUnit.group))
+
+        val groupToSelect = uiState.shownUnitGroups.indexOf(currentUnit.group)
+        if (groupToSelect > -1) {
+            chipsRowLazyListState.animateScrollToItem(groupToSelect)
+        }
     }
 }