diff --git a/lib/awful/ewmh.lua b/lib/awful/ewmh.lua
index 38303f0de..6d37c0784 100644
--- a/lib/awful/ewmh.lua
+++ b/lib/awful/ewmh.lua
@@ -160,7 +160,9 @@ end
 -- @tparam[opt] table hints A table with additional hints:
 -- @tparam[opt=false] boolean hints.raise should the client be raised?
 function ewmh.activate(c, context, hints)
-    client.focus = c
+    if c:isvisible() then
+        client.focus = c
+    end
     if hints and hints.raise then
         if awesome.startup or c:isvisible() then
             c:raise()