diff --git a/lib/controllers/settings_sections.dart b/lib/controllers/settings_sections.dart
index cedd81a..df1e64d 100644
--- a/lib/controllers/settings_sections.dart
+++ b/lib/controllers/settings_sections.dart
@@ -271,8 +271,10 @@ class SettingsSectionsController
                     return M3EButton.icon(
                       onPressed: () async {
                         final container = ProviderScope.containerOf(context);
-                        Navigator.of(context)
-                            .popUntil((route) => route.isFirst);
+
+                        final route = ModalRoute.of(context)!;
+                        Navigator.of(context).popUntil((r) => r.isFirst);
+                        await route.completed;
 
                         await container
                             .read(UnifiedPushController.provider.notifier)