diff --git a/src/ShellClients/ShellWindow.vala b/src/ShellClients/ShellWindow.vala
index 80eaec91b..31aba66f5 100644
--- a/src/ShellClients/ShellWindow.vala
+++ b/src/ShellClients/ShellWindow.vala
@@ -93,6 +93,20 @@ public class Gala.ShellWindow : PositionedWindow, GestureTarget {
 
         window_actor.visible = animating || visible;
 
+        if (window_actor.visible) {
+#if HAS_MUTTER48
+            window.display.get_compositor ().disable_unredirect ();
+#else
+            window.display.disable_unredirect ();
+#endif
+        } else {
+#if HAS_MUTTER48
+            window.display.get_compositor ().enable_unredirect ();
+#else
+            window.display.enable_unredirect ();
+#endif
+        }
+
         if (!Meta.Util.is_wayland_compositor ()) {
             if (window_actor.visible) {
                 Utils.x11_unset_window_pass_through (window, restore_previous_x11_region);