diff --git a/lib/awful/client.lua b/lib/awful/client.lua
index 61b97681..827c7375 100644
--- a/lib/awful/client.lua
+++ b/lib/awful/client.lua
@@ -226,7 +226,7 @@ function client.swap.global_bydirection(dir, sel)
             c:swap(sel)
 
         -- swapping to an empty screen
-        elseif get_screen(sel.screen) ~= get_screen(c.screen) and sel == c then
+        elseif sel == c then
             sel:move_to_screen(screen.focused())
 
         -- swapping to a nonempty screen