diff --git a/apps/matrix/apps/web/src/lib/components/chat/MessageInput.svelte b/apps/matrix/apps/web/src/lib/components/chat/MessageInput.svelte
index 02b9be508..3dbebbdf7 100644
--- a/apps/matrix/apps/web/src/lib/components/chat/MessageInput.svelte
+++ b/apps/matrix/apps/web/src/lib/components/chat/MessageInput.svelte
@@ -505,7 +505,7 @@
 	}
 </script>
 
-<div class="p-3 pb-4 lg:pb-20 safe-area-bottom">
+<div class="p-3 pb-4 safe-area-bottom">
 	<!-- Reply/Edit Preview -->
 	{#if replyTo || editMessage}
 		<div class="mb-2 flex items-center gap-2 rounded-xl bg-surface border border-border px-3 py-2">
diff --git a/apps/matrix/apps/web/src/routes/(app)/+layout.svelte b/apps/matrix/apps/web/src/routes/(app)/+layout.svelte
index 08184ef6f..a240069a4 100644
--- a/apps/matrix/apps/web/src/routes/(app)/+layout.svelte
+++ b/apps/matrix/apps/web/src/routes/(app)/+layout.svelte
@@ -339,6 +339,9 @@
 		<main class="main-content bg-background">
 			{@render children()}
 		</main>
+
+		<!-- Spacer for PillNavigation -->
+		<div class="pill-nav-spacer"></div>
 	</div>
 {:else}
 	<!-- Unknown state - redirect to login -->
@@ -359,6 +362,10 @@
 		flex: 1;
 		min-height: 0;
 		overflow: hidden;
-		padding-bottom: 80px;
+	}
+
+	.pill-nav-spacer {
+		flex-shrink: 0;
+		height: 80px;
 	}
 </style>