diff --git a/lib/awful/client.lua.in b/lib/awful/client.lua.in
index 2946d7fd..0f96d50f 100644
--- a/lib/awful/client.lua.in
+++ b/lib/awful/client.lua.in
@@ -678,6 +678,7 @@ local function idx(c)
         end
     end
 
+    local t = tag.selected(c.screen)
     local nmaster = tag.getnmaster(t)
     if idx <= nmaster then
         return {idx = idx, col=0, num=nmaster}