diff --git a/lib/awful/tag.lua.in b/lib/awful/tag.lua.in
index cfb3b105c..f746ed48a 100644
--- a/lib/awful/tag.lua.in
+++ b/lib/awful/tag.lua.in
@@ -630,7 +630,9 @@ capi.client.connect_signal("manage", function(c)
     c:connect_signal("property::screen", tag.withcurrent)
 end)
 
-capi.client.connect_signal("manage", tag.withcurrent)
+capi.client.connect_signal("manage", function(c)
+    timer.delayed_call(tag.withcurrent, c)
+end)
 capi.tag.connect_signal("request::select", tag.viewonly)
 
 capi.tag.add_signal("property::hide")