diff --git a/src/main/kotlin/app/App.kt b/src/main/kotlin/app/App.kt
index 1b276f7..2f98cff 100644
--- a/src/main/kotlin/app/App.kt
+++ b/src/main/kotlin/app/App.kt
@@ -234,13 +234,16 @@ class App {
 
 @Composable
 private fun TabsContent(tabs: List<TabInformation>, selectedTabKey: Int) {
-    val selectedTab = tabs.firstOrNull { it.key == selectedTabKey } ?: return
+    val selectedTab = tabs.firstOrNull { it.key == selectedTabKey }
 
     Box(
         modifier = Modifier
+            .background(MaterialTheme.colors.background)
             .fillMaxSize(),
     ) {
-        AppTab(selectedTab.tabViewModel)
+        if (selectedTab != null) {
+            AppTab(selectedTab.tabViewModel)
+        }
     }
 }