diff --git a/lib/awful/layout/suit/magnifier.lua.in b/lib/awful/layout/suit/magnifier.lua.in
index 06c221afd..2d4a52675 100644
--- a/lib/awful/layout/suit/magnifier.lua.in
+++ b/lib/awful/layout/suit/magnifier.lua.in
@@ -34,15 +34,15 @@ function arrange(p)
         fidx = 1
     end
 
-    -- Abort if no clients are present
-    if not focus then return end
-
     -- If focused window is not tiled, take the first one which is tiled.
     if client.floating.get(focus) then
         focus = cls[1]
         fidx = 1
     end
 
+    -- Abort if no clients are present
+    if not focus then return end
+
     local geometry = {}
     if #cls > 1 then
         geometry.width = area.width * math.sqrt(mwfact)