lib/presentation/views/main_menu/match_view/create_match/create_game/create_game_view.dart

@@ -183,6 +183,7 @@ class _CreateGameViewState extends State<CreateGameView> {
         body: SafeArea(
           child: Column(
             children: [
+              // Game name input field
               Container(
                 margin: CustomTheme.tileMargin,
                 child: TextInputField(
@@ -191,6 +192,9 @@ class _CreateGameViewState extends State<CreateGameView> {
                   hintText: loc.game_name,
                 ),
               ),
+
+              // Choose ruleset tile
+              if (!isEditMode())
                 ChooseTile(
                   title: loc.ruleset,
                   trailingText: selectedRuleset == null
@@ -215,6 +219,8 @@ class _CreateGameViewState extends State<CreateGameView> {
                     }
                   },
                 ),
+
+              // Choose color tile
               ChooseTile(
                 title: loc.color,
                 trailingText: selectedColor == null
@@ -234,6 +240,8 @@ class _CreateGameViewState extends State<CreateGameView> {
                   }
                 },
               ),
+
+              // Description input field
               Container(
                 margin: CustomTheme.tileMargin,
                 child: TextInputField(
@@ -245,7 +253,10 @@ class _CreateGameViewState extends State<CreateGameView> {
                   showCounterText: true,
                 ),
               ),
+
               const Spacer(),
+
+              // Create/Edit game button
               Padding(
                 padding: const EdgeInsets.all(12.0),
                 child: CustomWidthButton(
@@ -349,4 +360,8 @@ class _CreateGameViewState extends State<CreateGameView> {
       );
     }
   }
+
+  bool isEditMode() {
+    return widget.gameToEdit != null;
+  }
 }

lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart

@@ -126,6 +126,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
               ),
 
               // Game selection tile.
+              if (!isEditMode())
                 ChooseTile(
                   title: loc.game,
                   trailingText: selectedGame == null