diff --git a/android/app/src/main/java/com/fabledsword/thoughtsync/ui/EditorChrome.kt b/android/app/src/main/java/com/fabledsword/thoughtsync/ui/EditorChrome.kt
index 1dfc04f..f77044b 100644
--- a/android/app/src/main/java/com/fabledsword/thoughtsync/ui/EditorChrome.kt
+++ b/android/app/src/main/java/com/fabledsword/thoughtsync/ui/EditorChrome.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
@@ -63,7 +64,24 @@ fun EditorBottomBar(
     onAction: (EditorAction) -> Unit,
 ) {
     val dark = isSystemInDarkTheme()
-    BottomAppBar(containerColor = tint.background(dark)) {
+    BottomAppBar(
+        // imePadding so the bar rides above the keyboard. `enableEdgeToEdge` makes
+        // the manifest's adjustResize a no-op, and Scaffold does not inset its
+        // bottomBar slot for the IME — without this the bar sits under the keyboard
+        // the moment anyone types. The content Column deliberately does NOT also
+        // add imePadding: Scaffold measures this bar at its padded height, so the
+        // inset already reaches the content through innerPadding.
+        modifier = Modifier.imePadding(),
+        containerColor = tint.background(dark),
+        // EXPLICIT, and not optional. The default is contentColorFor(containerColor),
+        // which maps a colour-SCHEME ROLE to its `on-` pair and returns Unspecified
+        // for anything else. A note tint is never a role — the default note is
+        // 0xFF171717 while the dark scheme's surface is 0xFF0A0A0A — so the default
+        // resolved to Unspecified, Surface published that as LocalContentColor, and
+        // Icon drew with no colour filter: black vectors on a near-black bar. The
+        // toolbar was rendering the whole time and was invisible in dark mode.
+        contentColor = MaterialTheme.colorScheme.onSurface,
+    ) {
         if (!readOnly) {
             // A dot in the note's CURRENT colour rather than a palette icon: it
             // shows what the colour is as well as what the button does.
diff --git a/android/app/src/main/java/com/fabledsword/thoughtsync/ui/NoteEditorScreen.kt b/android/app/src/main/java/com/fabledsword/thoughtsync/ui/NoteEditorScreen.kt
index cbf5be3..fc446e7 100644
--- a/android/app/src/main/java/com/fabledsword/thoughtsync/ui/NoteEditorScreen.kt
+++ b/android/app/src/main/java/com/fabledsword/thoughtsync/ui/NoteEditorScreen.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -122,8 +121,11 @@ fun NoteEditorScreen(
             modifier =
                 Modifier
                     .fillMaxSize()
+                    // No imePadding here: EditorBottomBar carries it, so Scaffold
+                    // measures that bar at its keyboard-lifted height and the inset
+                    // already reaches this Column through `padding`. Adding it again
+                    // would inset for the keyboard twice.
                     .padding(padding)
-                    .imePadding()
                     .verticalScroll(rememberScrollState())
                     .padding(horizontal = 16.dp),
         ) {