diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 3a4d3260b..c75acf94f 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -327,6 +327,8 @@ namespace Scratch {
                     fullscreen ();
                     break;
                 default:
+                    // Ensure window can restore the correct size
+                    unfullscreen ();
                     break;
             }