diff --git a/event.c b/event.c
index a1b48f5b..fb21794e 100644
--- a/event.c
+++ b/event.c
@@ -630,7 +630,10 @@ event_handle_unmapnotify(xcb_unmap_notify_event_t *ev)
 
     if((c = client_getbywin(ev->window)))
     {
-        client_unmanage(c);
+        /* We got XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY on the root window.
+         * Ignore any UnmapNotifies we get due to that. */
+        if (ev->event == c->window)
+            client_unmanage(c);
     }
     else
         for(int i = 0; i < globalconf.embedded.len; i++)