diff --git a/lib/features/settings/widgets/settings_input_dialog.dart b/lib/features/settings/widgets/settings_input_dialog.dart
index fdc522fe..f65ea0dd 100644
--- a/lib/features/settings/widgets/settings_input_dialog.dart
+++ b/lib/features/settings/widgets/settings_input_dialog.dart
@@ -155,7 +155,9 @@ class SettingsPickerDialog<T> extends HookConsumerWidget with PresLogger {
                 title: Text(getTitle(e)),
                 value: e,
                 groupValue: selected,
-                onChanged: (value) => context.pop(e),
+                onChanged: (value) async {
+                  await Navigator.of(context).maybePop(e);
+                },
               ),
             )
             .toList(),