diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 713750423..dc7e43e7d 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -997,7 +997,7 @@ const Workspace = new Lang.Class({
 
             this._dropRect.set_position(geom.x, geom.y);
             this._dropRect.set_size(geom.width, geom.height);
-            this._updateWindowPositions(WindowPositionFlags.NONE);
+            this._updateWindowPositions(Main.overview.animationInProgress ? WindowPositionFlags.ANIMATE : WindowPositionFlags.NONE);
 
             this._actualGeometryLater = 0;
             return false;
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 3eb9c0dcb..50f079c3e 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -446,7 +446,7 @@ const WorkspacesDisplay = new Lang.Class({
 
     _init: function() {
         this.actor = new St.Widget({ clip_to_allocation: true });
-        this.actor.connect('notify::allocation', Lang.bind(this, this._allocationChanged));
+        this.actor.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesActualGeometry));
         this.actor.connect('parent-set', Lang.bind(this, this._parentSet));
 
         let clickAction = new Clutter.ClickAction()
@@ -676,12 +676,6 @@ const WorkspacesDisplay = new Lang.Class({
         }
     },
 
-    _allocationChanged: function() {
-        if (Main.overview.animationInProgress)
-            return;
-        this._updateWorkspacesActualGeometry();
-    },
-
     _updateWorkspacesActualGeometry: function() {
         if (!this._workspacesViews.length)
             return;