diff --git a/lib/awful/client.lua.in b/lib/awful/client.lua.in
index 8dab72c7..6058bcde 100644
--- a/lib/awful/client.lua.in
+++ b/lib/awful/client.lua.in
@@ -131,10 +131,12 @@ end
 --- Update client focus history.
 -- @param c The client that has been focused.
 function focus.history.add(c)
-    -- Remove the client if its in stack
-    focus.history.delete(c)
-    -- Record the client has latest focused
-    table.insert(data.focus, 1, c)
+    if focus.filter(c) then
+        -- Remove the client if its in stack
+        focus.history.delete(c)
+        -- Record the client has latest focused
+        table.insert(data.focus, 1, c)
+    end
 end
 
 --- Get the latest focused client for a screen in history.