diff --git a/lib/awful/client.lua.in b/lib/awful/client.lua.in
index 469dbfe3a..4a92acecc 100644
--- a/lib/awful/client.lua.in
+++ b/lib/awful/client.lua.in
@@ -220,7 +220,10 @@ function client.tiled(screen)
     local tclients = {}
     -- Remove floating clients
     for k, c in pairs(clients) do
-        if not client.floating.get(c) then
+        if not client.floating.get(c)
+            and not c.fullscreen
+            and not c.maximized_vertical
+            and not c.maximized_horizontal then
             table.insert(tclients, c)
         end
     end