diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index 8bcc5273a..d1353bfa0 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -1079,6 +1079,13 @@ get_top_visible_window_actor (MetaCompositor *compositor)
 
       if (!window->visible_to_compositor)
         continue;
+      if (meta_window_get_client_pid (window) == getpid ())
+        {
+          if (!clutter_actor_get_paint_visibility (CLUTTER_ACTOR (window_actor)))
+            continue;
+          if (clutter_actor_get_paint_opacity (CLUTTER_ACTOR (window_actor)) == 0)
+            continue;
+        }
 
       meta_window_get_buffer_rect (window, &buffer_rect);
       meta_display_get_size (priv->display,