diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index e45d10c00..e1f597346 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -804,6 +804,7 @@ meta_compositor_hide_window (MetaCompositor *compositor,
 {
   MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
   meta_window_actor_hide (window_actor, effect);
+  meta_stack_tracker_queue_sync_stack (compositor->display->stack_tracker);
 }
 
 void
@@ -951,6 +952,9 @@ get_top_visible_window_actor (MetaCompositor *compositor)
       MetaRectangle buffer_rect;
       MetaRectangle display_rect = { 0 };
 
+      if (!window->visible_to_compositor)
+        continue;
+
       meta_window_get_buffer_rect (window, &buffer_rect);
       meta_display_get_size (compositor->display,
                              &display_rect.width, &display_rect.height);