diff --git a/src/main/java/org/fenix/llanfair/Llanfair.java b/src/main/java/org/fenix/llanfair/Llanfair.java
index 08680e2..fc8e071 100644
--- a/src/main/java/org/fenix/llanfair/Llanfair.java
+++ b/src/main/java/org/fenix/llanfair/Llanfair.java
@@ -73,6 +73,7 @@ public class Llanfair extends BorderlessFrame implements TableModelListener,
 
 		RESOURCES = new Resources();
 		registerFonts();
+		setResizable(Settings.windowAutoSize.get());
 		setLookAndFeel();
 		addComponentListener(this);
 
@@ -353,6 +354,7 @@ public class Llanfair extends BorderlessFrame implements TableModelListener,
 				|| Settings.windowAutoSize.equals(property)
 				|| Settings.windowWidth.equals(property)
 				|| Run.NAME_PROPERTY.equals(property)) {
+			setResizable(Settings.windowAutoSize.get());
 			forceResize();
 		}
 	}