diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 3005c8dd7..17e19cb0e 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1073,6 +1073,9 @@ const Workspace = new Lang.Class({
      *  ANIMATE - Indicates that we need animate changing position.
      */
     positionWindows: function(flags) {
+        if (this.leavingOverview)
+            return;
+
         this._positionWindowsFlags |= flags;
 
         if (this._positionWindowsId > 0)