diff --git a/lib/awful/client.lua.in b/lib/awful/client.lua.in
index c4f8968e1..8961f9c69 100644
--- a/lib/awful/client.lua.in
+++ b/lib/awful/client.lua.in
@@ -222,7 +222,7 @@ function next(i, c)
         local fcls = {}
         -- Remove all non-normal clients
         for idx, c in ipairs(cls) do
-            if focus.filter(c) then
+            if focus.filter(c) or c == sel then
                 table.insert(fcls, c)
             end
         end