diff --git a/src/main/java/org/fenix/llanfair/Llanfair.java b/src/main/java/org/fenix/llanfair/Llanfair.java
index fbea250..c9d7c29 100644
--- a/src/main/java/org/fenix/llanfair/Llanfair.java
+++ b/src/main/java/org/fenix/llanfair/Llanfair.java
@@ -75,6 +75,7 @@ public class Llanfair extends BorderlessFrame implements TableModelListener,
 		registerFonts();
 		setResizable(Settings.windowUserResizable.get());
 		setLookAndFeel();
+		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 		addComponentListener(this);
 
 		run = new Run();