diff --git a/src/game/GameWindow.java b/src/game/GameWindow.java
index b2ebe2002a6b7aad1fc8fa72f6aa7dc321c22b17..0296076bb8275a02786d5648e1ad7710c1563f9b 100644
--- a/src/game/GameWindow.java
+++ b/src/game/GameWindow.java
@@ -68,6 +68,8 @@ public class GameWindow extends JFrame {
         menuBar.add(menu);
         setJMenuBar(menuBar);
 
+        addWindowListener(new GameWindowAdapter(model));
+
         pack();
         setResizable(false);
         setLocationRelativeTo(null);
diff --git a/src/game/GameWindowAdapter.java b/src/game/GameWindowAdapter.java
new file mode 100644
index 0000000000000000000000000000000000000000..2594b8b0b2e88f5df9c8296e44df503dd9e4e557
--- /dev/null
+++ b/src/game/GameWindowAdapter.java
@@ -0,0 +1,16 @@
+package game;
+
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+public class GameWindowAdapter extends WindowAdapter {
+    private GameModel model;
+
+    public GameWindowAdapter(GameModel model){
+        this.model = model;
+    }
+
+    public void windowClosed(WindowEvent e) {
+        model.stop();
+    }
+}