diff --git a/titlebar.c b/titlebar.c
index 2ba474e62..a3298d750 100644
--- a/titlebar.c
+++ b/titlebar.c
@@ -159,6 +159,8 @@ titlebar_draw(Client *c)
     switch(c->titlebar.position)
     {
       case Off:
+        if (c->titlebar.sw)
+            XUnmapWindow(globalconf.display, c->titlebar.sw->window);
         return;
       case Right:
       case Left: