diff --git a/js/ui/expoThumbnail.js b/js/ui/expoThumbnail.js
index 1585a1908b..43a64973d6 100644
--- a/js/ui/expoThumbnail.js
+++ b/js/ui/expoThumbnail.js
@@ -861,11 +861,12 @@ ExpoWorkspaceThumbnail.prototype = {
         let rearrangeTime = force ? REARRANGE_TIME_OFF/2 : REARRANGE_TIME_OFF;
 
         Main.layoutManager.monitors.forEach(function(monitor, monitorIndex) {
-            let iconCount = 0;
-            this.windows.filter(function(window) {
-                return monitorIndex === window.metaWindow.get_monitor();
-            },this).forEach(function(window) {
+            this.windows.forEach(function(window) {
                 if (window.inDrag) {return;}
+
+                if (monitorIndex !== window.metaWindow.get_monitor()) {
+                    return;
+                }
                 
                 window.refreshClone(false);
                 window.showUrgencyState();