diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index f5549894..d123b814 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -384,12 +384,12 @@ static void sig_setup_changed(void)
 	}
 
 	if (firsttime) {
+		firsttime = FALSE;
+		changed = TRUE;
+
 		windows_layout_restore();
 		if (windows != NULL)
 			return;
-
-		firsttime = FALSE;
-		changed = TRUE;
 	}
 
 	if (changed)