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 e14e50c605..fec5d92d70 100644
--- a/mobile/apps/photos/lib/ui/settings/gallery_settings_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/gallery_settings_screen.dart
@@ -13,10 +13,10 @@ import "package:photos/ui/viewer/gallery/photo_grid_size_picker_page.dart";
 import "package:photos/utils/navigation_util.dart";
 
 class GallerySettingsScreen extends StatefulWidget {
-  final bool fromGallerySettingsCTA;
+  final bool fromGalleryLayoutSettingsCTA;
   const GallerySettingsScreen({
     super.key,
-    required this.fromGallerySettingsCTA,
+    required this.fromGalleryLayoutSettingsCTA,
   });
 
   @override
@@ -51,7 +51,7 @@ class _GallerySettingsScreenState extends State<GallerySettingsScreen> {
                 iconButtonType: IconButtonType.secondary,
                 onTap: () {
                   Navigator.pop(context);
-                  if (!widget.fromGallerySettingsCTA) {
+                  if (!widget.fromGalleryLayoutSettingsCTA) {
                     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 1f7c5fdefd..8914f4f6cf 100644
--- a/mobile/apps/photos/lib/ui/settings/general_section_widget.dart
+++ b/mobile/apps/photos/lib/ui/settings/general_section_widget.dart
@@ -184,7 +184,7 @@ class GeneralSectionWidget extends StatelessWidget {
     routeToPage(
       context,
       const GallerySettingsScreen(
-        fromGallerySettingsCTA: false,
+        fromGalleryLayoutSettingsCTA: false,
       ),
     );
   }
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/layout_settings.dart b/mobile/apps/photos/lib/ui/viewer/gallery/layout_settings.dart
index dc5b74a31b..43e71c18dc 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/layout_settings.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/layout_settings.dart
@@ -147,7 +147,7 @@ class _GalleryLayoutSettingsState extends State<GalleryLayoutSettings> {
                       onTap: () => routeToPage(
                         context,
                         const GallerySettingsScreen(
-                          fromGallerySettingsCTA: true,
+                          fromGalleryLayoutSettingsCTA: true,
                         ),
                       ).then(
                         (_) {