diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeIconsDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeIconsDialog.kt
index c02410225..db815a6b8 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeIconsDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/CustomizeIconsDialog.kt
@@ -121,6 +121,7 @@ fun CustomizeIconsDialog(
             },
             neutralButtonText = if (customIconNames(prefs).contains(iconName)) stringResource(R.string.button_default) else null,
             onNeutral = {
+                showIconDialog = null
                 runCatching {
                     val icons2 = customIconNames(prefs).toMutableMap()
                     icons2.remove(iconName)
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/ReorderDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/ReorderDialog.kt
index 9d29903b5..0dee573ef 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/ReorderDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/ReorderDialog.kt
@@ -52,7 +52,7 @@ fun <T: Any> ReorderDialog(
     ThreeButtonAlertDialog(
         onDismissRequest = onDismissRequest,
         onConfirmed = { onConfirmed(reorderableItems) },
-        onNeutral = onNeutral,
+        onNeutral = { onDismissRequest(); onNeutral() },
         neutralButtonText = neutralButtonText,
         modifier = modifier,
         title = title,
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/SliderDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/SliderDialog.kt
index 713624e00..71b35e76d 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/SliderDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/SliderDialog.kt
@@ -36,7 +36,7 @@ fun SliderDialog(
     ThreeButtonAlertDialog(
         onDismissRequest = onDismissRequest,
         neutralButtonText = if (showDefault) stringResource(R.string.button_default) else null,
-        onNeutral = onDefault,
+        onNeutral = { onDismissRequest(); onDefault() },
         onConfirmed = { onDone(sliderPosition) },
         modifier = modifier,
         title = title,
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/TextInputDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/TextInputDialog.kt
index b70aad426..bfd68b9bb 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/TextInputDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/TextInputDialog.kt
@@ -61,7 +61,7 @@ fun TextInputDialog(
         confirmButtonText = confirmButtonText,
         checkOk = { checkTextValid(value.text) },
         neutralButtonText = neutralButtonText,
-        onNeutral = onNeutral,
+        onNeutral = { onDismissRequest(); onNeutral() },
         modifier = modifier,
         title = title,
         text = {
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt
index 5514ac1d5..9e73ea9c0 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt
@@ -74,7 +74,7 @@ fun ThreeButtonAlertDialog(
                 Row {
                     if (neutralButtonText != null)
                         TextButton(
-                            onClick = { onDismissRequest(); onNeutral() }
+                            onClick = onNeutral
                         ) { Text(neutralButtonText) }
                     Spacer(modifier.weight(1f))
                     TextButton(onClick = onDismissRequest) { Text(cancelButtonText) }
diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/ToolbarKeysCustomizer.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/ToolbarKeysCustomizer.kt
index 22d991427..af22bb98d 100644
--- a/app/src/main/java/helium314/keyboard/settings/dialogs/ToolbarKeysCustomizer.kt
+++ b/app/src/main/java/helium314/keyboard/settings/dialogs/ToolbarKeysCustomizer.kt
@@ -114,6 +114,7 @@ private fun ToolbarKeyCustomizer(
                 stringResource(R.string.button_default)
             else null,
         onNeutral = {
+            onDismissRequest()
             val keys = readCustomKeyCodes(prefs).toMutableMap()
             keys.remove(key.name)
             prefs.edit().putString(Settings.PREF_TOOLBAR_CUSTOM_KEY_CODES, Json.encodeToString(keys)).apply()
diff --git a/app/src/main/java/helium314/keyboard/settings/preferences/BackupRestorePreference.kt b/app/src/main/java/helium314/keyboard/settings/preferences/BackupRestorePreference.kt
index b8472e5e8..bc9534887 100644
--- a/app/src/main/java/helium314/keyboard/settings/preferences/BackupRestorePreference.kt
+++ b/app/src/main/java/helium314/keyboard/settings/preferences/BackupRestorePreference.kt
@@ -193,6 +193,7 @@ fun BackupRestorePreference(setting: Setting) {
             confirmButtonText = stringResource(R.string.button_backup),
             neutralButtonText = stringResource(R.string.button_restore),
             onNeutral = {
+                showDialog = false
                 val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
                     .addCategory(Intent.CATEGORY_OPENABLE)
                     .setType("application/zip")
diff --git a/app/src/main/java/helium314/keyboard/settings/preferences/CustomFontPreference.kt b/app/src/main/java/helium314/keyboard/settings/preferences/CustomFontPreference.kt
index 3cd12f3c0..c6ed8b68b 100644
--- a/app/src/main/java/helium314/keyboard/settings/preferences/CustomFontPreference.kt
+++ b/app/src/main/java/helium314/keyboard/settings/preferences/CustomFontPreference.kt
@@ -63,6 +63,7 @@ fun CustomFontPreference(setting: Setting) {
             onDismissRequest = { showDialog = false },
             onConfirmed = { launcher.launch(intent) },
             onNeutral = {
+                showDialog = false
                 fontFile.delete()
                 Settings.clearCachedTypeface()
                 keyboardNeedsReload = true
diff --git a/app/src/main/java/helium314/keyboard/settings/preferences/LoadGestureLibPreference.kt b/app/src/main/java/helium314/keyboard/settings/preferences/LoadGestureLibPreference.kt
index 820a714d2..d52ecfb4f 100644
--- a/app/src/main/java/helium314/keyboard/settings/preferences/LoadGestureLibPreference.kt
+++ b/app/src/main/java/helium314/keyboard/settings/preferences/LoadGestureLibPreference.kt
@@ -82,6 +82,7 @@ fun LoadGestureLibPreference(setting: Setting) {
         ConfirmationDialog(
             onDismissRequest = { showDialog = false },
             onConfirmed = {
+                showDialog = false
                 val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
                     .addCategory(Intent.CATEGORY_OPENABLE)
                     .setType("application/octet-stream")