diff --git a/src/LayoutManager.qml b/src/LayoutManager.qml
index 5273e1ec76e3681a789dcb39e00ff72bc4798a21..5f1868b1ccc8c20c7a971ec672e84519f2b16ee5 100644
--- a/src/LayoutManager.qml
+++ b/src/LayoutManager.qml
@@ -108,9 +108,9 @@ QtObject {
         const visibilityStr = AppSettingsManager.getValue(Settings.WindowState)
         var visibilitySetting = parseInt(visibilityStr)
 
-        // We should never restore a hidden state here. Default to normal
+        // We should never restore a hidden or fullscreen state here. Default to normal
         // windowed state in such a case. This shouldn't happen.
-        if (visibilitySetting === Window.Hidden) {
+        if (visibilitySetting === Window.Hidden || visibilitySetting === Window.FullScreen) {
             visibilitySetting = Window.Windowed
         }
         if (MainApplication.startMinimized) {