diff --git a/app/src/main/java/com/m57/hermescontrol/Navigation.kt b/app/src/main/java/com/m57/hermescontrol/Navigation.kt
index 647d807d..82870c8c 100644
--- a/app/src/main/java/com/m57/hermescontrol/Navigation.kt
+++ b/app/src/main/java/com/m57/hermescontrol/Navigation.kt
@@ -193,7 +193,7 @@ fun MainNavigation() {
         NavigationController.updatePrimaryScreens(bottomNavKeys)
     }
 
-    val showBottomBar = currentScreen != ConnectScreen
+    val isPrimaryScreen = currentScreen in bottomNavKeys
     val gesturesEnabled = currentScreen in DRAWER_GESTURE_SCREENS
     val openDrawer = { scope.launch { drawerState.open() } }
 
@@ -293,7 +293,7 @@ fun MainNavigation() {
         Scaffold(
             contentWindowInsets = WindowInsets.navigationBars,
             bottomBar = {
-                if (showBottomBar) {
+                if (isPrimaryScreen) {
                     NavigationBar {
                         bottomNavItems.forEach { item ->
                             NavigationBarItem(
diff --git a/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt b/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt
index 29389ab8..7f024aee 100644
--- a/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt
+++ b/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt
@@ -57,7 +57,7 @@ object AuthManager {
                     EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
                     EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM,
                 )
-            
+
             _bottomNavItemsFlow.value = getBottomNavItems()
         }
     }
diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
index a9f264f6..a4b379c6 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
@@ -322,11 +322,12 @@ fun ChatScreen(
                 )
             }
         },
-    ) { _ ->
+    ) { paddingValues ->
         Column(
             modifier =
                 Modifier
                     .fillMaxSize()
+                    .padding(paddingValues)
                     .background(backgroundGradient)
                     .imePadding(),
         ) {