diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index a2c7172a4..9a80f8c8e 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -735,6 +735,12 @@ Workspace.prototype = {
                 let delta = this._computeWindowMotion(cloneActor, slot);
 
                 motion += delta;
+
+                // Bail out early if we're already larger than the
+                // previous best
+                if (minimumMotionPermutation != null &&
+                    motion > minimumMotion)
+                    continue;
             }
 
             if (minimumMotionPermutation == null || motion < minimumMotion) {