diff --git a/lib/wibox/init.lua b/lib/wibox/init.lua
index a5021d37..78285553 100644
--- a/lib/wibox/init.lua
+++ b/lib/wibox/init.lua
@@ -388,6 +388,9 @@ local function new(args)
         ret.input_passthrough = args.input_passthrough
     end
 
+    -- Make sure all signals bubble up
+    ret:_connect_everything(wibox.emit_signal)
+
     return ret
 end
 
@@ -409,6 +412,8 @@ object.properties(capi.drawin, {
 
 capi.drawin.object = wibox.object
 
+object._setup_class_signals(wibox)
+
 return setmetatable(wibox, wibox.mt)
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80