diff --git a/mobile/apps/photos/lib/models/search/search_types.dart b/mobile/apps/photos/lib/models/search/search_types.dart
index eb0cd0ea85..d5e27e671c 100644
--- a/mobile/apps/photos/lib/models/search/search_types.dart
+++ b/mobile/apps/photos/lib/models/search/search_types.dart
@@ -187,11 +187,14 @@ extension SectionTypeExtensions on SectionType {
               try {
                 final Collection c =
                     await CollectionsService.instance.createAlbum(text);
-                unawaited(
-                  routeToPage(
-                    context,
-                    CollectionPage(CollectionWithThumbnail(c, null)),
-                  ),
+
+                // Close the dialog now so that it does not flash when leaving the album again.
+                Navigator.of(context).pop();
+
+                // ignore: unawaited_futures
+                await routeToPage(
+                  context,
+                  CollectionPage(CollectionWithThumbnail(c, null)),
                 );
               } catch (e, s) {
                 Logger("CreateNewAlbumIcon")
diff --git a/mobile/apps/photos/lib/ui/collections/album/vertical_list.dart b/mobile/apps/photos/lib/ui/collections/album/vertical_list.dart
index d65ae4049f..9b10cd49a2 100644
--- a/mobile/apps/photos/lib/ui/collections/album/vertical_list.dart
+++ b/mobile/apps/photos/lib/ui/collections/album/vertical_list.dart
@@ -146,7 +146,7 @@ class _AlbumVerticalListWidgetState extends State<AlbumVerticalListWidget> {
         },
         showOnlyLoadingState: true,
         textCapitalization: TextCapitalization.words,
-        popnavAfterSubmission: false,
+        popnavAfterSubmission: true,
       );
       if (result is Exception) {
         await showGenericErrorDialog(