diff --git a/game_template/lib/src/level_selection/level_selection_screen.dart b/game_template/lib/src/level_selection/level_selection_screen.dart
index 1a9a7076e..ec1ace081 100644
--- a/game_template/lib/src/level_selection/level_selection_screen.dart
+++ b/game_template/lib/src/level_selection/level_selection_screen.dart
@@ -61,7 +61,7 @@ class LevelSelectionScreen extends StatelessWidget {
         ),
         rectangularMenuArea: ElevatedButton(
           onPressed: () {
-            GoRouter.of(context).pop();
+            GoRouter.of(context).go('/');
           },
           child: const Text('Back'),
         ),
diff --git a/game_template/lib/src/main_menu/main_menu_screen.dart b/game_template/lib/src/main_menu/main_menu_screen.dart
index a8ab0edaf..aef2c6774 100644
--- a/game_template/lib/src/main_menu/main_menu_screen.dart
+++ b/game_template/lib/src/main_menu/main_menu_screen.dart
@@ -71,7 +71,7 @@ class MainMenuScreen extends StatelessWidget {
               _gap,
             ],
             ElevatedButton(
-              onPressed: () => GoRouter.of(context).go('/settings'),
+              onPressed: () => GoRouter.of(context).push('/settings'),
               child: const Text('Settings'),
             ),
             _gap,
diff --git a/game_template/lib/src/play_session/play_session_screen.dart b/game_template/lib/src/play_session/play_session_screen.dart
index f38163976..0b4cddad4 100644
--- a/game_template/lib/src/play_session/play_session_screen.dart
+++ b/game_template/lib/src/play_session/play_session_screen.dart
@@ -94,7 +94,7 @@ class _PlaySessionScreenState extends State<PlaySessionScreen> {
                       child: SizedBox(
                         width: double.infinity,
                         child: ElevatedButton(
-                          onPressed: () => GoRouter.of(context).pop(),
+                          onPressed: () => GoRouter.of(context).go('/play'),
                           child: const Text('Back'),
                         ),
                       ),
diff --git a/game_template/lib/src/win_game/win_game_screen.dart b/game_template/lib/src/win_game/win_game_screen.dart
index 88a5ca2b8..b78cea05d 100644
--- a/game_template/lib/src/win_game/win_game_screen.dart
+++ b/game_template/lib/src/win_game/win_game_screen.dart
@@ -63,7 +63,7 @@ class WinGameScreen extends StatelessWidget {
         ),
         rectangularMenuArea: ElevatedButton(
           onPressed: () {
-            GoRouter.of(context).pop();
+            GoRouter.of(context).go('/play');
           },
           child: const Text('Continue'),
         ),
diff --git a/game_template/pubspec.yaml b/game_template/pubspec.yaml
index 8227b2138..703256398 100644
--- a/game_template/pubspec.yaml
+++ b/game_template/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
 
   audioplayers: ^1.1.0
   cupertino_icons: ^1.0.2
-  go_router: ^5.0.5
+  go_router: ^5.2.1
   logging: ^1.1.0
   provider: ^6.0.2
   shared_preferences: ^2.0.13