diff --git a/src/main/java/name/nathanmcrae/numbersstation/Main.java b/src/main/java/name/nathanmcrae/numbersstation/Main.java
index 50a3000..3b7a4ba 100644
--- a/src/main/java/name/nathanmcrae/numbersstation/Main.java
+++ b/src/main/java/name/nathanmcrae/numbersstation/Main.java
@@ -51,6 +51,10 @@ public class Main extends Application {
 
     @Override
     public void start(Stage primaryStage) throws Exception {
+        primaryStage.setOnCloseRequest(e -> {
+            Platform.exit();
+        });
+
         try {
             if (startParams.notification().isPresent()){
                 FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("NotificationView.fxml"));