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 6f326d45..4054be90 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
@@ -126,7 +126,7 @@ private fun BasicUnitListScreen(
          */
         viewModel.setSelectedChip(currentUnit.group)
         viewModel.loadUnitsToShow(noBrokenCurrencies)
-        chipsRowLazyListState.animateScrollToItem(ALL_UNIT_GROUPS.indexOf(currentUnit.group))
+        chipsRowLazyListState.animateScrollToItem(uiState.shownUnitGroups.indexOf(currentUnit.group))
     }
 }