diff --git a/lib/awful/ewmh.lua.in b/lib/awful/ewmh.lua.in
index e6928296..b53320cb 100644
--- a/lib/awful/ewmh.lua.in
+++ b/lib/awful/ewmh.lua.in
@@ -9,6 +9,7 @@ local client = client
 local screen = screen
 local ipairs = ipairs
 local math = math
+local atag = require("awful.tag")
 
 --- Implements EWMH requests handling.
 -- awful.ewmh
@@ -147,6 +148,7 @@ function ewmh.tag(c, t)
     if not t then
         c.sticky = true
     else
+        c.screen = atag.getscreen(t)
         c:tags({ t })
     end
 end
diff --git a/lib/awful/rules.lua.in b/lib/awful/rules.lua.in
index cb657cad..32d84a4d 100644
--- a/lib/awful/rules.lua.in
+++ b/lib/awful/rules.lua.in
@@ -206,8 +206,8 @@ function rules.execute(c, props, callbacks)
         if property == "floating" then
             aclient.floating.set(c, value)
         elseif property == "tag" then
-            c:tags({ value })
             c.screen = atag.getscreen(value)
+            c:tags({ value })
         elseif property == "switchtotag" and value and props.tag then
             atag.viewonly(props.tag)
         elseif property == "height" or property == "width" or