diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/NavigationBarSpacerCompat.kt b/app/src/main/java/org/thoughtcrime/securesms/main/NavigationBarSpacerCompat.kt
index 62aad858ba..f3fe4789f7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/NavigationBarSpacerCompat.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/NavigationBarSpacerCompat.kt
@@ -5,8 +5,10 @@
 
 package org.thoughtcrime.securesms.main
 
+import android.os.Build
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -17,10 +19,14 @@ import org.thoughtcrime.securesms.util.ViewUtil
 
 @Composable
 fun NavigationBarSpacerCompat() {
-  val resources = LocalContext.current.resources
-  val navigationBarHeight = remember(resources) {
-    DimensionUnit.PIXELS.toDp(ViewUtil.getNavigationBarHeight(resources).toFloat()).dp
-  }
+  if (Build.VERSION.SDK_INT >= 23) {
+    Spacer(Modifier.navigationBarsPadding())
+  } else {
+    val resources = LocalContext.current.resources
+    val navigationBarHeight = remember(resources) {
+      DimensionUnit.PIXELS.toDp(ViewUtil.getNavigationBarHeight(resources).toFloat()).dp
+    }
 
-  Spacer(Modifier.height(navigationBarHeight))
+    Spacer(Modifier.height(navigationBarHeight))
+  }
 }