diff --git a/lib/redux/client/client_actions.dart b/lib/redux/client/client_actions.dart
index 1058fa56b..c08887ef9 100644
--- a/lib/redux/client/client_actions.dart
+++ b/lib/redux/client/client_actions.dart
@@ -368,6 +368,10 @@ void handleClientAction(
       }
       break;
     case EntityAction.settings:
+      // Add the settings list to the route stack to improve the back button
+      if (state.prefState.isMobile) {
+        viewEntitiesByType(entityType: EntityType.settings);
+      }
       store.dispatch(ViewSettings(
         client: client,
         section: kSettingsLocalization,
diff --git a/lib/redux/group/group_actions.dart b/lib/redux/group/group_actions.dart
index 899bcd38c..abd1f7e8e 100644
--- a/lib/redux/group/group_actions.dart
+++ b/lib/redux/group/group_actions.dart
@@ -225,6 +225,7 @@ void handleGroupAction(
   }
 
   final store = StoreProvider.of<AppState>(context);
+  final state = store.state;
   final localization = AppLocalization.of(context);
   final group = groups.first;
   final groupIds = groups.map((group) => group.id).toList();
@@ -234,6 +235,10 @@ void handleGroupAction(
       editEntity(entity: group);
       break;
     case EntityAction.settings:
+      // Add the settings list to the route stack to improve the back button
+      if (state.prefState.isMobile) {
+        viewEntitiesByType(entityType: EntityType.settings);
+      }
       store.dispatch(ViewSettings(
         group: group,
         section: kSettingsCompanyDetails,