diff --git a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
index 39fc738f1f..5080db032a 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
@@ -216,10 +216,16 @@ public class SwingUtil
 
 				if (result == JOptionPane.OK_OPTION)
 				{
-					callback.run();
-					System.exit(0);
+					frame.dispose();
 				}
 			}
+
+			@Override
+			public void windowClosed(WindowEvent event)
+			{
+				callback.run();
+				System.exit(0);
+			}
 		});
 	}