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