diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
index 6ed7ee62a..5da7c3b93 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@@ -27,6 +27,7 @@ import androidx.activity.BackEventCompat
 import androidx.activity.OnBackPressedCallback
 import androidx.core.view.ViewCompat
 import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
@@ -367,6 +368,9 @@ class MainFragment :
         requireNotNull(sheetBackCallback) { "SheetBackPressedCallback was not available" }
             .invalidateEnabled()
 
+        // Stop the FrameLayout containing the fabs from eating touch events elsewhere
+        binding.mainFabContainer.isVisible = binding.homeNewPlaylistFab.mainFab.isVisible && binding.homeShuffleFab.isVisible
+
         return true
     }
 
diff --git a/app/src/main/res/layout-w720dp/fragment_main.xml b/app/src/main/res/layout-w720dp/fragment_main.xml
index 90feb3b88..2b8a21ad3 100644
--- a/app/src/main/res/layout-w720dp/fragment_main.xml
+++ b/app/src/main/res/layout-w720dp/fragment_main.xml
@@ -23,6 +23,7 @@
             tools:layout="@layout/fragment_home" />
 
         <org.oxycblt.auxio.home.EdgeFrameLayout
+            android:id="@+id/main_fab_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="bottom|end"
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 74a134760..e6458b2bd 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -29,6 +29,7 @@
             android:visibility="invisible" />
 
         <org.oxycblt.auxio.home.EdgeFrameLayout
+            android:id="@+id/main_fab_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="bottom|end"