diff --git a/src/client.c b/src/client.c
index f879049..581d7a3 100644
--- a/src/client.c
+++ b/src/client.c
@@ -877,6 +877,9 @@ client_remove(struct client *c)
      XReparentWindow(W->dpy, c->win, W->root, c->geo.x, c->geo.y);
      XDestroyWindow(W->dpy, c->frame);
 
+     if(c->titlebar)
+          barwin_remove(c->titlebar);
+
      /* Remove from global client list */
      SLIST_REMOVE(&W->h.client, c, client, next);