diff --git a/lib/awful/titlebar.lua b/lib/awful/titlebar.lua
index 5f3fd756..0be553d4 100644
--- a/lib/awful/titlebar.lua
+++ b/lib/awful/titlebar.lua
@@ -513,6 +513,9 @@ local function new(c, args)
     -- Handle declarative/recursive widget container
     ret.setup = base.widget.setup
 
+    c._private = c._private or {}
+    c._private.titlebars = bars
+
     return ret
 end
 
diff --git a/tests/examples/awful/template.lua b/tests/examples/awful/template.lua
index 52ffc0fc..9f84404f 100644
--- a/tests/examples/awful/template.lua
+++ b/tests/examples/awful/template.lua
@@ -94,7 +94,7 @@ local function client_widget(c, col, label)
     local l = wibox.layout.align.vertical()
     l.fill_space = true
 
-    local tbs = c.titlebars or {}
+    local tbs = c._private and c._private.titlebars or {}
 
     local map = {
         top    = "set_first",