diff --git a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
index d1128664e..d16079d7c 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
@@ -53,8 +53,6 @@ abstract class MainWindowModule {
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
 		stage.setMinWidth(650);
 		stage.setMinHeight(440);
-		stage.setMaxWidth(screenSize.getWidth());
-		stage.setMaxHeight(screenSize.getHeight());
 		stage.setTitle("Cryptomator");
 		return stage;
 	}
diff --git a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
index aad74ffc6..9f8204706 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
@@ -48,7 +48,11 @@ public class ResizeController implements FxController {
 		window.setY(settings.windowYPositionProperty().get());
 		window.setX(settings.windowXPositionProperty().get());
 		window.setHeight(settings.windowHeightProperty().get());
+		//TODO: remove comments
+		//window.setHeight(settings.windowHeightProperty().get() > window.getMaxHeight() ? window.getMaxHeight() * 0.95 : settings.windowHeightProperty().get());
+
 		window.setWidth(settings.windowWidthProperty().get());
+		//window.setWidth(settings.windowWidthProperty().get() > window.getMaxWidth() ? window.getMaxWidth() * 0.95 : settings.windowWidthProperty().get());
 	}
 
 	private void startResize(MouseEvent evt) {