diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/TabsManager.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/TabsManager.kt
index fa4081f..10a1bd7 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/TabsManager.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/TabsManager.kt
@@ -43,8 +43,8 @@ class TabsManager @Inject constructor(
         val latestSelectedTabIndex = appSettingsRepository.latestRepositoryTabSelected
 
         _currentTab.value = when(latestSelectedTabIndex < 0) {
-            true -> _tabsFlow.value.first()
-            false -> tabsFlow.value[latestSelectedTabIndex]
+            true -> tabsFlow.value.first()
+            false -> tabsFlow.value.getOrNull(latestSelectedTabIndex) ?: tabsFlow.value.first()
         }
     }