diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index a75ac12c5..1d5b9ab20 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -671,6 +671,9 @@ meta_compositor_remove_window (MetaCompositor *compositor,
   if (compositor->unredirected_window == window)
     set_unredirected_window (compositor, NULL);
 
+  if (compositor->top_window_actor == window_actor)
+    compositor->top_window_actor = NULL;
+
   meta_window_actor_destroy (window_actor);
 }