diff --git a/src/client.c b/src/client.c
index b944e72..f628ce6 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1392,8 +1392,6 @@ client_remove(struct client *c)
      XGrabServer(W->dpy);
      XSetErrorHandler(wmfs_error_handler_dummy);
      XReparentWindow(W->dpy, c->win, W->root, c->rgeo.x, c->rgeo.y);
-     if(c->flags & CLIENT_REMOVEALL)
-          XMapWindow(W->dpy, c->win);
      XUngrabButton(W->dpy, AnyButton, AnyModifier, c->win);
      ewmh_set_wm_state(c->win, WithdrawnState);
 
diff --git a/src/wmfs.c b/src/wmfs.c
index b8ccb12..ac1a6f3 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -418,6 +418,7 @@ wmfs_quit(void)
           c = SLIST_FIRST(&W->h.client);
           client_update_props(c, CPROP_LOC | CPROP_FLAG | CPROP_GEO);
           c->flags |= (CLIENT_IGNORE_LAYOUT | CLIENT_REMOVEALL);
+          XMapWindow(W->dpy, c->win);
           client_remove(c);
      }