diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt
index 62782b8d..f41d4669 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt
@@ -1,5 +1,6 @@
 package de.mm20.launcher2.ui.component
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.spring
 import androidx.compose.foundation.background
@@ -99,6 +100,15 @@ fun BottomSheetDialog(
         )
     }
 
+    BackHandler {
+        if (dismissible()) {
+            scope.launch {
+                draggableState.animateTo(SwipeState.Dismiss)
+                onDismissRequest()
+            }
+        }
+    }
+
     LaunchedEffect(draggableState.currentValue) {
         if (isOpenAnimationFinished && draggableState.currentValue == SwipeState.Dismiss) {
             onDismissRequest()