diff --git a/app/src/main/java/org/toop/app/widget/complex/PopupWidget.java b/app/src/main/java/org/toop/app/widget/complex/PopupWidget.java
index 853bf88..4f6bee1 100644
--- a/app/src/main/java/org/toop/app/widget/complex/PopupWidget.java
+++ b/app/src/main/java/org/toop/app/widget/complex/PopupWidget.java
@@ -1,7 +1,21 @@
 package org.toop.app.widget.complex;
 
+import javafx.geometry.Pos;
+import javafx.scene.control.Button;
+
 public abstract class PopupWidget extends StackWidget {
+	private final Button popButton;
+
 	public PopupWidget() {
 		super("bg-popup");
+
+		popButton = new Button("X");
+		popButton.setOnAction(_ -> hide());
+
+		add(Pos.TOP_RIGHT, popButton);
+	}
+
+	protected void setOnPop(Runnable onPop) {
+		popButton.setOnAction(_ -> onPop.run());
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/toop/app/widget/popup/QuitPopup.java b/app/src/main/java/org/toop/app/widget/popup/QuitPopup.java
index 04349dc..264e936 100644
--- a/app/src/main/java/org/toop/app/widget/popup/QuitPopup.java
+++ b/app/src/main/java/org/toop/app/widget/popup/QuitPopup.java
@@ -20,5 +20,10 @@ public class QuitPopup extends PopupWidget {
 		});
 
 		add(Pos.CENTER, confirmWidget);
+
+		setOnPop(() -> {
+			App.stopQuit();
+			hide();
+		});
 	}
 }
\ No newline at end of file