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

@@ -234,8 +234,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                         players: selectedPlayers,
                       );
                       await db.matchDao.addMatch(match: match);
-                      widget.onWinnerChanged?.call();
-
                       if (context.mounted) {
                         Navigator.pushReplacement(
                           context,

lib/presentation/views/main_menu/match_view/match_result_view.dart

@@ -38,6 +38,13 @@ class _GameResultViewState extends State<GameResultView> {
     return Scaffold(
       backgroundColor: CustomTheme.backgroundColor,
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Icons.close),
+          onPressed: () {
+            widget.onWinnerChanged?.call();
+            Navigator.of(context).pop();
+          },
+        ),
         backgroundColor: CustomTheme.backgroundColor,
         scrolledUnderElevation: 0,
         title: Text(