diff --git a/bin/application/Main.class b/bin/application/Main.class
index 50f8bf3..87af273 100644
Binary files a/bin/application/Main.class and b/bin/application/Main.class differ
diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class
index b8e120c..c79f41a 100644
Binary files a/bin/application/MainWindowController$1.class and b/bin/application/MainWindowController$1.class differ
diff --git a/bin/application/MainWindowController$10.class b/bin/application/MainWindowController$10.class
index cc71ebf..dbb34b5 100644
Binary files a/bin/application/MainWindowController$10.class and b/bin/application/MainWindowController$10.class differ
diff --git a/bin/application/MainWindowController$11.class b/bin/application/MainWindowController$11.class
index 4fb6065..43809b1 100644
Binary files a/bin/application/MainWindowController$11.class and b/bin/application/MainWindowController$11.class differ
diff --git a/bin/application/MainWindowController$12.class b/bin/application/MainWindowController$12.class
index 9ec88a0..8ba0235 100644
Binary files a/bin/application/MainWindowController$12.class and b/bin/application/MainWindowController$12.class differ
diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class
index 1211ea3..60b3986 100644
Binary files a/bin/application/MainWindowController$2.class and b/bin/application/MainWindowController$2.class differ
diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class
index b41d036..0fca0b6 100644
Binary files a/bin/application/MainWindowController$3.class and b/bin/application/MainWindowController$3.class differ
diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class
index 2b6f23c..cbe5c1b 100644
Binary files a/bin/application/MainWindowController$4.class and b/bin/application/MainWindowController$4.class differ
diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class
index 414288e..b6d780a 100644
Binary files a/bin/application/MainWindowController$5.class and b/bin/application/MainWindowController$5.class differ
diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class
index 6a9343b..dede120 100644
Binary files a/bin/application/MainWindowController$6.class and b/bin/application/MainWindowController$6.class differ
diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class
index c108923..37c995c 100644
Binary files a/bin/application/MainWindowController$7.class and b/bin/application/MainWindowController$7.class differ
diff --git a/bin/application/MainWindowController$8.class b/bin/application/MainWindowController$8.class
index a870744..95da18f 100644
Binary files a/bin/application/MainWindowController$8.class and b/bin/application/MainWindowController$8.class differ
diff --git a/bin/application/MainWindowController$9.class b/bin/application/MainWindowController$9.class
index df25d1f..fe685fe 100644
Binary files a/bin/application/MainWindowController$9.class and b/bin/application/MainWindowController$9.class differ
diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class
index 0227133..0926421 100644
Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ
diff --git a/src/application/Main.java b/src/application/Main.java
index 7e05425..21f4699 100644
--- a/src/application/Main.java
+++ b/src/application/Main.java
@@ -195,6 +195,8 @@ public class Main extends Application {
 			public void changed(ObservableValue<? extends Number> observable, Number oldValue, final Number newValue) {
 				mainWindowController.refreshUIData();
 				mainWindowController.refreshplayBtnPosition();
+				//TODO saveSettings only on left mouseBtn release
+				mainWindowController.saveSettings();
 			}
 		};
 
diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java
index 6a814d6..017942f 100644
--- a/src/application/MainWindowController.java
+++ b/src/application/MainWindowController.java
@@ -228,6 +228,8 @@ public class MainWindowController {
     private int xPosHelper;
     private int selectedUIDataIndex;
     private int selected;
+    private double windowWidth;
+    private double windowHeight;
 	private DirectoryChooser directoryChooser = new DirectoryChooser();
 	private File dirWin = new File(System.getProperty("user.home") + "/Documents/cemu_UI");
 	private File dirLinux = new File(System.getProperty("user.home") + "/cemu_UI");
@@ -268,7 +270,13 @@ public class MainWindowController {
 		smmdbApiQuery = new SmmdbApiQuery();
 	}
 	
-	void initUI(){		
+	void initUI() {
+		System.out.println(getWindowWidth());
+		if (getWindowWidth() > 100 && getWindowHeight() > 100) {
+			mainAnchorPane.setPrefSize(getWindowWidth(), getWindowHeight());	
+		}
+		refreshplayBtnPosition();
+		
 		cemuTextField.setText(cemuPath);
 		romTextField.setText(romPath);
 		colorPicker.setValue(Color.valueOf(getColor()));
@@ -1288,6 +1296,8 @@ public class MainWindowController {
 				props.setProperty("cloudService", getCloudService());
 			}
 			props.setProperty("folderID", main.cloudController.getFolderID(getCloudService()));
+			props.setProperty("windowWidth", String.valueOf(mainAnchorPane.getWidth()));
+			props.setProperty("windowHeight", String.valueOf(mainAnchorPane.getHeight()));
     		if(System.getProperty("os.name").equals("Linux")){
     			outputStream = new FileOutputStream(configFileLinux);
     		}else{
@@ -1365,6 +1375,20 @@ public class MainWindowController {
 				setCloudSync(false);
 			}
 			
+			try {
+				setWindowWidth(Double.parseDouble(props.getProperty("windowWidth")));
+			} catch (Exception e) {
+				LOGGER.error("could not load windowWidth, setting default instead", e);
+				setWindowWidth(904);
+			}
+			
+			try {
+				setWindowHeight(Double.parseDouble(props.getProperty("windowHeight")));
+			} catch (Exception e) {
+				LOGGER.error("could not load windowHeight, setting default instead", e);
+				setWindowHeight(600);
+			}
+			
 			inputStream.close();
 	    	LOGGER.info("loading settings done!");
 		} catch (IOException e) {
@@ -1579,4 +1603,20 @@ public class MainWindowController {
 		this.playBtn = playBtn;
 	}
 
+	public double getWindowWidth() {
+		return windowWidth;
+	}
+
+	public void setWindowWidth(double windowWidth) {
+		this.windowWidth = windowWidth;
+	}
+
+	public double getWindowHeight() {
+		return windowHeight;
+	}
+
+	public void setWindowHeight(double windowHeight) {
+		this.windowHeight = windowHeight;
+	}
+
 }