diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 9864a1565..eb7716a0d 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -1256,8 +1256,9 @@ const WindowManager = new Lang.Class({
             return;
         }
 
-        if (whichChange == Meta.SizeChange.FULLSCREEN ||
-            whichChange == Meta.SizeChange.UNFULLSCREEN)
+        if ((whichChange == Meta.SizeChange.FULLSCREEN ||
+             whichChange == Meta.SizeChange.UNFULLSCREEN) &&
+            oldFrameRect.width > 0 && oldFrameRect.height > 0)
             this._fullscreenAnimation(shellwm, actor, oldFrameRect, whichChange);
         else
             shellwm.completed_size_change(actor);