diff --git a/lib/presentation/views/main_menu/create_game/choose_game_view.dart b/lib/presentation/views/main_menu/create_game/choose_game_view.dart
index 992f02b..53a4fcb 100644
--- a/lib/presentation/views/main_menu/create_game/choose_game_view.dart
+++ b/lib/presentation/views/main_menu/create_game/choose_game_view.dart
@@ -38,9 +38,7 @@ class _ChooseGameViewState extends State<ChooseGameView> {
         leading: IconButton(
           icon: const Icon(Icons.arrow_back_ios),
           onPressed: () {
-            Navigator.of(
-              context,
-            ).pop(selectedGameIndex == -1 ? null : selectedGameIndex);
+            Navigator.of(context).pop(selectedGameIndex);
           },
         ),
         title: const Text(
@@ -70,7 +68,11 @@ class _ChooseGameViewState extends State<ChooseGameView> {
                   isHighlighted: selectedGameIndex == index,
                   onPressed: () async {
                     setState(() {
-                      selectedGameIndex = index;
+                      if (selectedGameIndex == index) {
+                        selectedGameIndex = -1;
+                      } else {
+                        selectedGameIndex = index;
+                      }
                     });
                   },
                 );
diff --git a/lib/presentation/views/main_menu/create_game/create_game_view.dart b/lib/presentation/views/main_menu/create_game/create_game_view.dart
index bbb392b..4bf05e7 100644
--- a/lib/presentation/views/main_menu/create_game/create_game_view.dart
+++ b/lib/presentation/views/main_menu/create_game/create_game_view.dart
@@ -148,11 +148,14 @@ class _CreateGameViewState extends State<CreateGameView> {
                     ),
                   ),
                 );
-                selectedRuleset = games[selectedGameIndex].$3;
-                selectedRulesetIndex = rulesets.indexWhere(
-                  (r) => r.$1 == selectedRuleset,
-                );
-                setState(() {});
+                if (selectedGameIndex != -1) {
+                  setState(() {
+                    selectedRuleset = games[selectedGameIndex].$3;
+                    selectedRulesetIndex = rulesets.indexWhere(
+                      (r) => r.$1 == selectedRuleset,
+                    );
+                  });
+                }
               },
             ),
             ChooseTile(