diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index 99e8808ad6..de74c1cf33 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -86,8 +86,9 @@
     <style name="Signal.ConversationSettings.WindowAnimation" parent="android:style/Animation" >
     </style>
 
+    <!-- For some reason, using fully transparent causes issues with the nav bar height calculation. Using *almost* transparent prevents this. -->
     <style name="TextSecure.LightNoActionBar.TransparentNavigationBar">
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@color/effectively_transparent_black</item>
         <item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
     </style>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 43f170bb04..7cbb413671 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,6 +5,8 @@
 
     <color name="signal_accent_green">#4CAF50</color>
 
+    <color name="effectively_transparent_black">#01000000</color>
+
     <color name="transparent_black_05">#0D000000</color>
     <color name="transparent_black_08">#14000000</color>
     <color name="transparent_black_10">#18000000</color>