diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index b84c45b1f..14670d100 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -416,8 +416,11 @@ var WorkspaceLayout = GObject.registerClass({
             upper: 1,
         });
 
-        this._stateAdjustment.connect('notify::value', () =>
-            this.layout_changed());
+        this._stateAdjustment.connect('notify::value', () => {
+            [...this._windows.keys()].forEach(
+                preview => this._syncOverlay(preview));
+            this.layout_changed();
+        });
     }
 
     _isBetterLayout(oldLayout, newLayout) {
@@ -632,6 +635,10 @@ var WorkspaceLayout = GObject.registerClass({
         }
     }
 
+    _syncOverlay(preview) {
+        preview.overlay_enabled = this._stateAdjustment.value === 1;
+    }
+
     /**
      * addWindow:
      * @param {WindowPreview} window: the window to add
@@ -665,6 +672,7 @@ var WorkspaceLayout = GObject.registerClass({
             return winA.get_stable_sequence() - winB.get_stable_sequence();
         });
 
+        this._syncOverlay(window);
         this._container.add_child(window);
 
         this._layout = null;