diff --git a/src/manage.c b/src/manage.c
index 2cc0adae..c1a79e7f 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -82,7 +82,7 @@ void manage_window(xcb_property_handlers_t *prophs, xcb_connection_t *conn,
                 return;
         }
 
-        if (attr->map_state != XCB_MAP_STATE_VIEWABLE) {
+        if (needs_to_be_mapped && attr->map_state != XCB_MAP_STATE_VIEWABLE) {
                 LOG("Window not mapped, not managing\n");
                 goto out;
         }