diff --git a/lib/presentation/views/main_menu/match_view/match_result_view.dart b/lib/presentation/views/main_menu/match_view/match_result_view.dart
index 549d86c..ffa9ba3 100644
--- a/lib/presentation/views/main_menu/match_view/match_result_view.dart
+++ b/lib/presentation/views/main_menu/match_view/match_result_view.dart
@@ -8,7 +8,6 @@ import 'package:tallee/data/models/player.dart';
 import 'package:tallee/data/models/score_entry.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/widgets/buttons/custom_width_button.dart';
-import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
 import 'package:tallee/presentation/widgets/tiles/match_result_view/custom_radio_list_tile.dart';
 import 'package:tallee/presentation/widgets/tiles/match_result_view/live_edit_list_tile.dart';
 import 'package:tallee/presentation/widgets/tiles/match_result_view/score_list_tile.dart';
@@ -109,34 +108,17 @@ class _MatchResultViewState extends State<MatchResultView> {
             Expanded(
               child: isLiveEditMode && rulesetSupportsScoreEntry()
                   ? ListView.builder(
-                      itemCount: allPlayers.length + 1,
+                      itemCount: allPlayers.length,
                       itemBuilder: (context, index) {
-                        if (index < allPlayers.length) {
-                          return LiveEditListTile(
-                            title: allPlayers[index].name,
-                            onChanged: (value) {
-                              setState(() {
-                                controller[index].text = value.toString();
-                              });
-                            },
-                            value: int.tryParse(controller[index].text) ?? 0,
-                          );
-                        } else {
-                          return Center(
-                            child: Padding(
-                              padding: const EdgeInsets.only(top: 30),
-                              child: MainMenuButton(
-                                text: 'Ansicht verlassen',
-                                onPressed: () => {
-                                  setState(() {
-                                    isLiveEditMode = false;
-                                  }),
-                                },
-                                icon: Icons.close,
-                              ),
-                            ),
-                          );
-                        }
+                        return LiveEditListTile(
+                          title: allPlayers[index].name,
+                          onChanged: (value) {
+                            setState(() {
+                              controller[index].text = value.toString();
+                            });
+                          },
+                          value: int.tryParse(controller[index].text) ?? 0,
+                        );
                       },
                     )
                   : Container(
@@ -254,6 +236,14 @@ class _MatchResultViewState extends State<MatchResultView> {
                       }
                     : null,
               ),
+            ] else ...[
+              CustomWidthButton(
+                text: 'Ansicht verlassen',
+                sizeRelativeToWidth: 0.95,
+                onPressed: () => setState(() {
+                  isLiveEditMode = false;
+                }),
+              ),
             ],
           ],
         ),