diff --git a/awesomerc.lua.in b/awesomerc.lua.in
index cd7b11bc..8e10fd27 100644
--- a/awesomerc.lua.in
+++ b/awesomerc.lua.in
@@ -342,7 +342,6 @@ awful.hooks.manage.register(function (c)
     -- if they're not focusable, so set border anyway.
     c.border_width = beautiful.border_width
     c.border_color = beautiful.border_normal
-    client.focus = c
 
     -- Check if the application should be floating.
     local cls = c.class
@@ -365,6 +364,9 @@ awful.hooks.manage.register(function (c)
         awful.client.movetotag(tags[target.screen][target.tag], c)
     end
 
+    -- Do this after tag mapping, so you don't see it on the wrong tag for a split second.
+    client.focus = c
+
     -- Set the windows at the slave,
     -- i.e. put it at the end of others instead of setting it master.
     -- awful.client.setslave(c)