diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainBottomChrome.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainBottomChrome.kt
index 0f961449c7..ab38cec292 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainBottomChrome.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainBottomChrome.kt
@@ -72,6 +72,7 @@ fun MainBottomChrome(
     modifier = modifier
       .fillMaxWidth()
       .animateContentSize()
+      .then(if (navigationType == NavigationType.RAIL) Modifier.navigationBarsPadding() else Modifier)
   ) {
     if (state.mainToolbarMode == MainToolbarMode.FULL && navigationType != NavigationType.RAIL) {
       Box(
@@ -97,7 +98,7 @@ fun MainBottomChrome(
       return@Column
     }
 
-    val snackBarModifier = if (state.mainToolbarMode == MainToolbarMode.BASIC) {
+    val snackBarModifier = if (state.mainToolbarMode == MainToolbarMode.BASIC && navigationType != NavigationType.RAIL) {
       Modifier.navigationBarsPadding()
     } else {
       Modifier