diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
index 57f46a3c9..ac52d4a9c 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
@@ -61,11 +61,12 @@ public class FxApplication {
 
 		// show main window
 		appWindows.showMainWindow().thenAccept(stage -> {
-			boolean hide = settings.startHidden().get();
-			if (hasTrayIcon) {
-				stage.hide();
-			} else {
-				stage.setIconified(hide);
+			if (settings.startHidden().get()) {
+				if (hasTrayIcon) {
+					stage.hide();
+				} else {
+					stage.setIconified(true);
+				}
 			}
 		});