diff --git a/app/src/main/java/app/codeg/android/feature/sessiondetail/SessionDetailScreen.kt b/app/src/main/java/app/codeg/android/feature/sessiondetail/SessionDetailScreen.kt
index d3df5dd..dcbb47c 100644
--- a/app/src/main/java/app/codeg/android/feature/sessiondetail/SessionDetailScreen.kt
+++ b/app/src/main/java/app/codeg/android/feature/sessiondetail/SessionDetailScreen.kt
@@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -222,7 +223,7 @@ fun SessionDetailScreen(
             )
         },
         bottomBar = {
-            Column(Modifier.imePadding()) {
+            Column(Modifier.imePadding().navigationBarsPadding()) {
                 ui.pendingPermission?.let { p ->
                     PermissionRequestCard(
                         parsed = p.parsed,
diff --git a/app/src/main/java/app/codeg/android/feature/settings/AgentDetailScreen.kt b/app/src/main/java/app/codeg/android/feature/settings/AgentDetailScreen.kt
index 5cdd3f7..ca4fbb8 100644
--- a/app/src/main/java/app/codeg/android/feature/settings/AgentDetailScreen.kt
+++ b/app/src/main/java/app/codeg/android/feature/settings/AgentDetailScreen.kt
@@ -115,7 +115,7 @@ fun AgentDetailContent(
     // — like Hermes' raw editor, they hide the host "Save" and the generic
     // native-config editor.
     val selfContained = agentType == AgentType.KIMI_CODE || agentType == AgentType.PI
-    Column(Modifier.fillMaxSize().imePadding()) {
+    Column(Modifier.fillMaxSize().imePadding().navigationBarsPadding()) {
         Column(
             Modifier.weight(1f).fillMaxWidth().verticalScroll(rememberScrollState())
                 .padding(horizontal = 16.dp, vertical = 12.dp),