diff --git a/js/ui/layout.js b/js/ui/layout.js
index 1a9a328a7..d855ade6b 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -776,10 +776,16 @@ const LayoutManager = new Lang.Class({
             if (!metaWindow.showing_on_its_workspace())
                 continue;
 
-            if (metaWindow.is_monitor_sized()) {
-                let monitor = this.monitors[metaWindow.get_monitor()];
-                if (monitor)
-                    monitor.inFullscreen = true;
+            if (layer == Meta.StackLayer.FULLSCREEN ||
+               (layer == Meta.StackLayer.OVERRIDE_REDIRECT && metaWindow.is_monitor_sized())) {
+                if (metaWindow.is_screen_sized()) {
+                    for (let i = 0; i < this.monitors.length; i++)
+                        this.monitors[i].inFullscreen = true;
+                } else {
+                    let monitor = this.monitors[metaWindow.get_monitor()];
+                    if (monitor)
+                        monitor.inFullscreen = true;
+                }
             }
         }
     },