diff --git a/lib/awful/client.lua.in b/lib/awful/client.lua.in
index 48fd6b6eb..dffc1f94b 100644
--- a/lib/awful/client.lua.in
+++ b/lib/awful/client.lua.in
@@ -603,6 +603,7 @@ end
 --- Toggle the floating state of a client between 'auto' and 'true'.
 -- @param c A client.
 function floating.toggle(c)
+    local c = c or capi.client.focus
     -- If it has been set to floating
     if property.get(c, "floating") then
         floating.set(c, nil)