diff --git a/lib/awful/tag.lua.in b/lib/awful/tag.lua.in
index 949a83d0..a984ed58 100644
--- a/lib/awful/tag.lua.in
+++ b/lib/awful/tag.lua.in
@@ -374,10 +374,11 @@ capi.client.add_signal("manage", function(c, startup)
             c.screen = capi.mouse.screen
         end
     end
-    withcurrent(c, startup)
     c:add_signal("property::screen", withcurrent)
 end)
 
+capi.client.add_signal("manage", withcurrent)
+
 for s = 1, capi.screen.count() do
     capi.screen[s]:add_signal("tag::history::update", history.update)
 end