diff --git a/src/compositor/meta-window-actor-x11.c b/src/compositor/meta-window-actor-x11.c
index 4f20336d8..1bef22530 100644
--- a/src/compositor/meta-window-actor-x11.c
+++ b/src/compositor/meta-window-actor-x11.c
@@ -1138,7 +1138,10 @@ handle_updates (MetaWindowActorX11 *actor_x11)
        * which causes the shadows to look bad.
        */
       if (surface && meta_window_x11_always_update_shape (window))
-        update_shape_region (actor_x11);
+        {
+          update_opaque_region (actor_x11);
+          update_shape_region (actor_x11);
+        }
 
       return;
     }