diff --git a/lib/awful/widget.lua.in b/lib/awful/widget.lua.in
index 09dd6011e..5b4744703 100644
--- a/lib/awful/widget.lua.in
+++ b/lib/awful/widget.lua.in
@@ -72,6 +72,8 @@ function taglist.new(scr, label, buttons)
             end
         end
     end
+    hooks.focus.register(function (c) return taglist_update(c.screen) end)
+    hooks.unfocus.register(function (c) return taglist_update(c.screen) end)
     hooks.arrange.register(taglist_update)
     hooks.tags.register(taglist_update)
     hooks.tagged.register(function (c, tag) taglist_update(c.screen) end)