diff --git a/mobile/apps/photos/lib/ui/settings/advanced_settings_screen.dart b/mobile/apps/photos/lib/ui/settings/advanced_settings_screen.dart
index d1b9ccfbd1..74f8afb11d 100644
--- a/mobile/apps/photos/lib/ui/settings/advanced_settings_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/advanced_settings_screen.dart
@@ -11,7 +11,6 @@ import 'package:photos/ui/components/title_bar_title_widget.dart';
 import 'package:photos/ui/components/title_bar_widget.dart';
 import "package:photos/ui/components/toggle_switch_widget.dart";
 import "package:photos/ui/settings/app_icon_selection_screen.dart";
-import "package:photos/ui/settings/gallery_settings_screen.dart";
 import "package:photos/ui/settings/ml/machine_learning_settings_page.dart";
 import 'package:photos/utils/navigation_util.dart';
 
@@ -71,28 +70,6 @@ class AdvancedSettingsScreen extends StatelessWidget {
                       const SizedBox(
                         height: 24,
                       ),
-                      MenuItemWidget(
-                        captionedTextWidget: CaptionedTextWidget(
-                          title: S.of(context).gallery,
-                        ),
-                        menuItemColor: colorScheme.fillFaint,
-                        trailingWidget: Icon(
-                          Icons.chevron_right_outlined,
-                          color: colorScheme.strokeBase,
-                        ),
-                        singleBorderRadius: 8,
-                        alignCaptionedTextToLeft: true,
-                        onTap: () async {
-                          // ignore: unawaited_futures
-                          routeToPage(
-                            context,
-                            const GallerySettingsScreen(),
-                          );
-                        },
-                      ),
-                      const SizedBox(
-                        height: 24,
-                      ),
                       MenuItemWidget(
                         captionedTextWidget: const CaptionedTextWidget(
                           title: "App icon",
diff --git a/mobile/apps/photos/lib/ui/settings/gallery_settings_screen.dart b/mobile/apps/photos/lib/ui/settings/gallery_settings_screen.dart
index 23627f6679..99233bf30c 100644
--- a/mobile/apps/photos/lib/ui/settings/gallery_settings_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/gallery_settings_screen.dart
@@ -55,7 +55,6 @@ class _GallerySettingsScreenState extends State<GallerySettingsScreen> {
                 onTap: () {
                   Navigator.pop(context);
                   Navigator.pop(context);
-                  Navigator.pop(context);
                 },
               ),
             ],
diff --git a/mobile/apps/photos/lib/ui/settings/general_section_widget.dart b/mobile/apps/photos/lib/ui/settings/general_section_widget.dart
index e4f5df18cc..153bbbcaa6 100644
--- a/mobile/apps/photos/lib/ui/settings/general_section_widget.dart
+++ b/mobile/apps/photos/lib/ui/settings/general_section_widget.dart
@@ -13,6 +13,7 @@ import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import "package:photos/ui/growth/referral_screen.dart";
 import 'package:photos/ui/settings/advanced_settings_screen.dart';
 import 'package:photos/ui/settings/common_settings.dart';
+import "package:photos/ui/settings/gallery_settings_screen.dart";
 import "package:photos/ui/settings/language_picker.dart";
 import "package:photos/ui/settings/notification_settings_screen.dart";
 import "package:photos/ui/settings/widget_settings_screen.dart";
@@ -110,6 +111,18 @@ class GeneralSectionWidget extends StatelessWidget {
           },
         ),
         sectionOptionSpacing,
+        MenuItemWidget(
+          captionedTextWidget: CaptionedTextWidget(
+            title: S.of(context).gallery,
+          ),
+          pressedColor: getEnteColorScheme(context).fillFaint,
+          trailingIcon: Icons.chevron_right_outlined,
+          trailingIconIsMuted: true,
+          onTap: () async {
+            _onGallerySettingsTapped(context);
+          },
+        ),
+        sectionOptionSpacing,
         MenuItemWidget(
           captionedTextWidget: CaptionedTextWidget(
             title: S.of(context).advanced,
@@ -153,4 +166,11 @@ class GeneralSectionWidget extends StatelessWidget {
       const AdvancedSettingsScreen(),
     );
   }
+
+  void _onGallerySettingsTapped(BuildContext context) {
+    routeToPage(
+      context,
+      const GallerySettingsScreen(),
+    );
+  }
 }
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/gallery_group_type_picker_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/gallery_group_type_picker_page.dart
index 76ef5835fb..edba5377ee 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/gallery_group_type_picker_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/gallery_group_type_picker_page.dart
@@ -34,7 +34,6 @@ class GalleryGroupTypePickerPage extends StatelessWidget {
                   Navigator.pop(context);
                   Navigator.pop(context);
                   Navigator.pop(context);
-                  Navigator.pop(context);
                 },
               ),
             ],
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/photo_grid_size_picker_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/photo_grid_size_picker_page.dart
index 72178521a2..f2c8203292 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/photo_grid_size_picker_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/photo_grid_size_picker_page.dart
@@ -34,7 +34,6 @@ class PhotoGridSizePickerPage extends StatelessWidget {
                   Navigator.pop(context);
                   Navigator.pop(context);
                   Navigator.pop(context);
-                  Navigator.pop(context);
                 },
               ),
             ],