diff --git a/app/src/main/java/com/m57/hermescontrol/Navigation.kt b/app/src/main/java/com/m57/hermescontrol/Navigation.kt
index e3b2896a..13f4404f 100644
--- a/app/src/main/java/com/m57/hermescontrol/Navigation.kt
+++ b/app/src/main/java/com/m57/hermescontrol/Navigation.kt
@@ -197,7 +197,7 @@ fun MainNavigation(sessionId: String? = null) {
     // recomposes and reflects choices instantly.
     val bottomNavItemsState by AuthManager.bottomNavItemsFlow.collectAsState()
     val bottomNavItems = resolveBottomNavItems(bottomNavItemsState)
-    val bottomNavKeys = remember(bottomNavItems) { bottomNavItems.map { it.key }.toSet() }
+    val bottomNavKeys = remember(bottomNavItems) { bottomNavItems.mapTo(mutableSetOf()) { it.key } }
 
     // Sync primary screens to NavigationController
     LaunchedEffect(bottomNavKeys) {