diff --git a/wibox.c b/wibox.c
index 11e5c8a3..0d2a6652 100644
--- a/wibox.c
+++ b/wibox.c
@@ -899,7 +899,15 @@ luaA_wibox_newindex(lua_State *L)
       case A_TK_ALIGN:
         buf = luaL_checklstring(L, 3, &len);
         (*wibox)->align = draw_align_fromstr(buf, len);
-        wibox_position_update(*wibox);
+        switch((*wibox)->type)
+        {
+          case WIBOX_TYPE_NORMAL:
+            wibox_position_update(*wibox);
+            break;
+          case WIBOX_TYPE_TITLEBAR:
+            titlebar_update_geometry_floating(client_getbytitlebar(*wibox));
+            break;
+        }
         break;
       case A_TK_POSITION:
         switch((*wibox)->type)
@@ -972,8 +980,6 @@ luaA_wibox_newindex(lua_State *L)
                 break;
             }
         break;
-      case A_TK_GEOMETRY:
-        break;
       default:
         switch((*wibox)->type)
         {