diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
index 72ee0da2af..0900e95a48 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
@@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.BoxWithConstraintsScope
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -473,6 +474,7 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
           navigator = wrappedNavigator,
           modifier = chatNavGraphState.writeContentToGraphicsLayer(),
           paneExpansionState = paneExpansionState,
+          contentWindowInsets = WindowInsets(),
           bottomNavContent = {
             if (isNavigationBarVisible) {
               Column(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/compose/ScreenTitlePane.kt b/app/src/main/java/org/thoughtcrime/securesms/components/compose/ScreenTitlePane.kt
index 81c2338fcd..639cdce1b2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/compose/ScreenTitlePane.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/compose/ScreenTitlePane.kt
@@ -31,7 +31,6 @@ fun ScreenTitlePane(
       .padding(
         start = if (windowSizeClass.isExtended()) 80.dp else 20.dp,
         end = 20.dp,
-        top = 12.dp,
         bottom = 12.dp
       )
   )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt
index 7fe66f3136..69cda962f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt
@@ -364,9 +364,7 @@ private fun NewConversationRecipientPicker(
       findByUsername = callbacks,
       findByPhoneNumber = callbacks
     ),
-    modifier = modifier
-      .fillMaxSize()
-      .padding(vertical = 12.dp)
+    modifier = modifier.fillMaxSize()
   )
 }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivityV2.kt
index f805a6224c..f0eecb7c03 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivityV2.kt
@@ -220,9 +220,7 @@ private fun CreateGroupRecipientPicker(
         findByUsername = callbacks,
         findByPhoneNumber = callbacks
       ),
-      modifier = modifier
-        .fillMaxSize()
-        .padding(vertical = 12.dp)
+      modifier = modifier.fillMaxSize()
     )
 
     AnimatedContent(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt
index a4cf9c466e..e3216bb0d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt
@@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.LocalMinimumInteractiveComponentSize
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.ScaffoldDefaults
 import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
@@ -229,6 +230,7 @@ fun AppScaffold(
   paneExpansionState: PaneExpansionState = rememberPaneExpansionState(),
   paneExpansionDragHandle: (@Composable ThreePaneScaffoldScope.(PaneExpansionState) -> Unit)? = null,
   snackbarHost: @Composable () -> Unit = {},
+  contentWindowInsets: WindowInsets = ScaffoldDefaults.contentWindowInsets,
   animatorFactory: AppScaffoldAnimationStateFactory = AppScaffoldAnimationStateFactory.Default
 ) {
   val isForcedCompact = WindowSizeClass.checkForcedCompact()
@@ -241,6 +243,7 @@ fun AppScaffold(
       navRailContent = navRailContent,
       bottomNavContent = bottomNavContent,
       windowSizeClass = windowSizeClass,
+      contentWindowInsets = contentWindowInsets,
       modifier = modifier
     )
 
@@ -252,7 +255,7 @@ fun AppScaffold(
 
   Scaffold(
     containerColor = Color.Transparent,
-    contentWindowInsets = WindowInsets(),
+    contentWindowInsets = contentWindowInsets,
     topBar = topBarContent,
     snackbarHost = snackbarHost,
     modifier = modifier
@@ -296,7 +299,8 @@ fun AppScaffold(
               listContent = secondaryContent,
               navRailContent = navRailContent,
               bottomNavContent = bottomNavContent,
-              windowSizeClass = windowSizeClass
+              windowSizeClass = windowSizeClass,
+              contentWindowInsets = WindowInsets() // parent scaffold already applies the necessary insets
             )
           }
         }
@@ -352,12 +356,13 @@ private fun ListAndNavigation(
   bottomNavContent: @Composable () -> Unit,
   snackbarHost: @Composable () -> Unit = {},
   windowSizeClass: WindowSizeClass,
+  contentWindowInsets: WindowInsets,
   modifier: Modifier = Modifier
 ) {
   Scaffold(
     containerColor = Color.Transparent,
     topBar = topBarContent,
-    contentWindowInsets = WindowInsets(),
+    contentWindowInsets = contentWindowInsets,
     snackbarHost = snackbarHost,
     modifier = modifier
   ) { paddingValues ->