diff --git a/app/src/main/java/dev/kaizen/app/chat/ChatScreen.kt b/app/src/main/java/dev/kaizen/app/chat/ChatScreen.kt
index 2057584..054f50b 100644
--- a/app/src/main/java/dev/kaizen/app/chat/ChatScreen.kt
+++ b/app/src/main/java/dev/kaizen/app/chat/ChatScreen.kt
@@ -535,7 +535,7 @@ fun ChatScreen(
                 gesturesEnabled = true // Allows swiping from the screen's left edge to open the drawer
             ) {
                 MeshBackground {
-                    Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                    Box(Modifier.fillMaxSize().imePadding(), contentAlignment = Alignment.Center) {
                         // 1. Scrollable Chat Content
                         // Stretches to the full screen, allowing bubbles to scroll cleanly behind the floating bottom dock.
                         // Centered layout with responsive width capping on tablets.
@@ -707,24 +707,21 @@ fun ChatScreen(
                         Column(
                             modifier = Modifier
                                 .align(Alignment.BottomCenter)
-                                .then(
+                                .background(
                                     if (imeVisible) {
-                                        Modifier.background(scrimColor)
+                                        Brush.verticalGradient(listOf(scrimColor, scrimColor))
                                     } else {
-                                        Modifier.background(
-                                            Brush.verticalGradient(
-                                                colorStops = arrayOf(
-                                                    0f to Color.Transparent,
-                                                    0.35f to scrimColor.copy(alpha = 0.6f),
-                                                    0.7f to scrimColor.copy(alpha = 0.92f),
-                                                    1f to scrimColor,
-                                                ),
-                                            )
+                                        Brush.verticalGradient(
+                                            colorStops = arrayOf(
+                                                0f to Color.Transparent,
+                                                0.35f to scrimColor.copy(alpha = 0.6f),
+                                                0.7f to scrimColor.copy(alpha = 0.92f),
+                                                1f to scrimColor,
+                                            ),
                                         )
                                     }
                                 )
                                 .navigationBarsPadding()
-                                .imePadding()
                                 .then(if (isTablet) Modifier.widthIn(max = 720.dp) else Modifier)
                         ) {
                             if (!imeVisible) {