diff --git a/lib/awful/rules.lua.in b/lib/awful/rules.lua.in
index 16655e62..e344828c 100644
--- a/lib/awful/rules.lua.in
+++ b/lib/awful/rules.lua.in
@@ -224,11 +224,6 @@ function rules.execute(c, props, callbacks)
         end
     end
 
-    -- If untagged, stick the client on the current one.
-    if #c:tags() == 0 then
-        atag.withcurrent(c)
-    end
-
     -- Apply all callbacks.
     if callbacks then
         for i, callback in pairs(callbacks) do
@@ -244,7 +239,6 @@ function rules.execute(c, props, callbacks)
 end
 
 client.connect_signal("manage", rules.apply)
-client.disconnect_signal("manage", atag.withcurrent)
 
 return rules
 
diff --git a/lib/awful/tag.lua.in b/lib/awful/tag.lua.in
index 834ef511..f746ed48 100644
--- a/lib/awful/tag.lua.in
+++ b/lib/awful/tag.lua.in
@@ -6,6 +6,7 @@
 
 -- Grab environment we need
 local util = require("awful.util")
+local timer = require("gears.timer")
 local tostring = tostring
 local pairs = pairs
 local ipairs = ipairs
@@ -629,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")