diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index 7451aa7740..699b24a8ef 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -224,6 +224,17 @@ open class MainActivity : BaseActivity(), DownloadServiceListener {
         bottom_view.gone()
         content.doOnApplyWindowInsets { v, insets, _ ->
             setNavBarColor(insets)
+            val contextView = window?.decorView?.findViewById<View>(R.id.action_mode_bar)
+            contextView?.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                leftMargin = insets.systemWindowInsetLeft
+                rightMargin = insets.systemWindowInsetRight
+            }
+            // Consume any horizontal insets and pad all content in. There's not much we can do
+            // with horizontal insets
+            v.updatePadding(
+                left = insets.systemWindowInsetLeft,
+                right = insets.systemWindowInsetRight
+            )
             appbar.updatePadding(
                 top = insets.systemWindowInsetTop
             )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
index 44ad333b0a..6b608e929c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
@@ -265,6 +265,10 @@ fun BottomSheetDialog.setEdgeToEdge(
     contentView.post {
         (contentView.parent as View).background = null
     }
+    contentView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+        leftMargin = insets.systemWindowInsetLeft
+        rightMargin = insets.systemWindowInsetRight
+    }
     if (setTopMargin > 0) (contentView.parent as View).updateLayoutParams<ViewGroup.MarginLayoutParams> {
         height = activity.window.decorView.height - insets.systemWindowInsetTop - setTopMargin
     }