diff --git a/lib/awful/tag.lua.in b/lib/awful/tag.lua.in
index ad89dfb68..2273d473d 100644
--- a/lib/awful/tag.lua.in
+++ b/lib/awful/tag.lua.in
@@ -567,10 +567,10 @@ capi.client.connect_signal("manage", function(c, startup)
             c.screen = capi.mouse.screen
         end
     end
+    c:connect_signal("property::screen", tag.withcurrent)
 end)
 
 capi.client.connect_signal("manage", tag.withcurrent)
-capi.client.connect_signal("property::screen", tag.withcurrent)
 capi.tag.connect_signal("request::select", tag.viewonly)
 
 capi.tag.add_signal("property::hide")