diff --git a/src/main/java/duke/gui/Main.java b/src/main/java/duke/gui/Main.java
index 4b4c6f00a1..2c50c87de1 100644
--- a/src/main/java/duke/gui/Main.java
+++ b/src/main/java/duke/gui/Main.java
@@ -25,6 +25,10 @@ public void start(Stage stage) {
             stage.setScene(scene);
             fxmlLoader.<MainWindow>getController().setDuke(duke);
             stage.show();
+            stage.setOnCloseRequest(event -> {
+                String terminate = "bye";
+                duke.getResponse(terminate);
+            });
         } catch (IOException e) {
             e.printStackTrace();
         }