diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
index 445bb3dd2..b08644732 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -38,6 +38,7 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.MenuItem.SHOW_AS_ACTION_NEVER
 import android.view.View
+import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
 import android.widget.ImageView
 import androidx.activity.OnBackPressedCallback
@@ -264,6 +265,16 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
                     insets
                 } else {
                     binding.viewPager.updatePadding(bottom = bottomBarHeight + bottomInsets)
+
+                    /* BottomAppBar could handle size and insets automatically, but then it gets quite large,
+                       so we do it like this instead */
+                    binding.bottomNav.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                        height = bottomBarHeight + bottomInsets
+                    }
+                    binding.bottomNav.updatePadding(bottom = bottomInsets)
+                    binding.bottomTabLayout.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                        bottomMargin = bottomInsets
+                    }
                     insets.inset(0, 0, 0, bottomInsets)
                 }
             }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ddd1a2975..9fa91e80b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -66,15 +66,14 @@
         <com.google.android.material.bottomappbar.BottomAppBar
             android:id="@+id/bottomNav"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/bottomAppBarHeight"
             android:layout_gravity="bottom"
             android:backgroundTint="?attr/colorSurface"
             app:contentInsetStart="0dp"
             app:contentInsetStartWithNavigation="0dp"
             app:fabAlignmentMode="end"
             app:menuAlignmentMode="auto"
-            app:navigationContentDescription="@string/action_open_drawer"
-            app:paddingBottomSystemWindowInsets="true">
+            app:navigationContentDescription="@string/action_open_drawer" >
 
             <com.keylesspalace.tusky.view.AdaptiveTabLayout
                 android:id="@+id/bottomTabLayout"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d20479d3a..dc7556819 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -84,7 +84,6 @@
 
     <dimen name="media_description_sheet_bottom_padding">8dp</dimen>
 
-    <!-- height of an BottomAppBar according to Material Design guidelines -->
-    <dimen name="bottomAppBarHeight">80dp</dimen>
+    <dimen name="bottomAppBarHeight">64dp</dimen>
 
 </resources>