diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt b/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt
index cb921822..7ce30326 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt
@@ -14,11 +14,8 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import de.mm20.launcher2.backup.BackupCompatibility
@@ -59,14 +56,23 @@ fun RestoreBackupSheet(
                     onClick = { viewModel.restore() }) {
                     Text(stringResource(R.string.preference_restore))
                 }
-            } else if (state == RestoreBackupState.InvalidFile || state == RestoreBackupState.Restored) {
+            } else if (state == RestoreBackupState.InvalidFile || state == RestoreBackupState.Restored || state == RestoreBackupState.Ready) {
                 OutlinedButton(
                     onClick = onDismissRequest
                 ) {
                     Text(stringResource(R.string.close))
                 }
             }
-        }
+        },
+        dismissButton = if (state == RestoreBackupState.Ready && compatibility != BackupCompatibility.Incompatible) {
+            {
+                OutlinedButton(
+                    onClick = onDismissRequest
+                ) {
+                    Text(stringResource(android.R.string.cancel))
+                }
+            }
+        } else null
     ) {
         when (state) {
             RestoreBackupState.Parsing -> {
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt
index eef97dee..f9d124c5 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt
@@ -74,7 +74,14 @@ fun CreateBackupSheet(
                     Text(stringResource(R.string.close))
                 }
             }
-        }
+        },
+        dismissButton = if (state == CreateBackupState.Ready) {{
+            OutlinedButton(
+                onClick = onDismissRequest
+            ) {
+                Text(stringResource(android.R.string.cancel))
+            }
+        }} else null
     ) {
         when (state) {
             CreateBackupState.Ready -> {