diff --git a/lib/awful.lua.in b/lib/awful.lua.in
index a75f88260..5879cc3c1 100644
--- a/lib/awful.lua.in
+++ b/lib/awful.lua.in
@@ -1466,9 +1466,9 @@ function titlebar.add(c, args)
         })
     end
 
-    titlebar.update(c)
-
     c.titlebar = tb
+
+    titlebar.update(c)
 end
 
 --- Update a titlebar. This should be called in some hooks.