diff --git a/src/main/java/com/example/tictactoe_game/TicTacToeFX.java b/src/main/java/com/example/tictactoe_game/TicTacToeFX.java
index 5fb54918d4d1162ce43057f37f268c2449e6db7f..9d4eb9619577502bd595970997c256d646ef2411 100644
--- a/src/main/java/com/example/tictactoe_game/TicTacToeFX.java
+++ b/src/main/java/com/example/tictactoe_game/TicTacToeFX.java
@@ -49,11 +49,11 @@ public class TicTacToeFX extends Application {
                 button.setPrefSize(100, 100); // Größe der Buttons
                 grid.add(button, col, row); // Hinzufügen zum Grid
                 buttons[row][col] = button;
-                button.addEventHandler(GameEvent.VICTORY_EVENT, gameEventHandler);
-                button.addEventHandler(GameEvent.DRAW_EVENT, gameEventHandler);
                 button.setOnAction(event -> handleButtonClick(button));
             }
         }
+        grid.addEventHandler(GameEvent.VICTORY_EVENT, gameEventHandler);
+        grid.addEventHandler(GameEvent.DRAW_EVENT, gameEventHandler);
 
         // Szene und Stage erstellen
         Scene scene1 = new Scene(grid, 300, 300); // Größe der Szene