diff --git a/titlebar.c b/titlebar.c
index f8a37dc5..bce50445 100644
--- a/titlebar.c
+++ b/titlebar.c
@@ -134,6 +134,9 @@ titlebar_update_geometry_floating(Client *c)
 area_t
 titlebar_update_geometry(Client *c, area_t geometry)
 {
+    if(!c->titlebar.sw)
+        return;
+
     switch(c->titlebar.position)
     {
       default: