diff --git a/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java b/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java
index 96446d6f8..bcbbec1a4 100644
--- a/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java
@@ -70,6 +70,11 @@ public class AllMediaDocumentsFragment
     this.noMedia      = ViewUtil.findById(view, R.id.no_documents);
     this.gridManager  = new StickyHeaderGridLayoutManager(1);
 
+    // allow content to be drawn behind the navigation bar
+    recyclerView.setClipToPadding(false);
+    // add padding to avoid content hidden behind system bars
+    ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);
+
     this.recyclerView.setAdapter(new AllMediaDocumentsAdapter(getContext(),
         new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()),
         this));
diff --git a/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java b/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java
index e9b533699..31b605979 100644
--- a/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java
@@ -66,6 +66,11 @@ public class AllMediaGalleryFragment
     this.noMedia      = ViewUtil.findById(view, R.id.no_images);
     this.gridManager  = new StickyHeaderGridLayoutManager(getCols());
 
+    // allow content to be drawn behind the navigation bar
+    recyclerView.setClipToPadding(false);
+    // add padding to avoid content hidden behind system bars
+    ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);
+
     this.recyclerView.setAdapter(new AllMediaGalleryAdapter(getContext(),
                                                          GlideApp.with(this),
                                                          new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()),
diff --git a/src/main/res/layout/all_media_activity.xml b/src/main/res/layout/all_media_activity.xml
index d09463246..d2c2e1a7a 100644
--- a/src/main/res/layout/all_media_activity.xml
+++ b/src/main/res/layout/all_media_activity.xml
@@ -3,14 +3,11 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
-        android:fitsSystemWindows="true"
-        android:background="?attr/colorPrimary"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:elevation="0dp">
+            android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"