diff --git a/objects/client.c b/objects/client.c
index 6f220fe6f..6cf40e135 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -1176,7 +1176,11 @@ client_unmanage(client_t *c, bool window_valid)
         xcb_reparent_window(globalconf.connection, c->window, globalconf.screen->root,
                 c->geometry.x, c->geometry.y);
     }
+
+    /* Ignore all spurious enter/leave notify events */
+    client_ignore_enterleave_events();
     xcb_destroy_window(globalconf.connection, c->frame_window);
+    client_restore_enterleave_events();
 
     if(window_valid)
     {