diff --git a/lib/awful/screen.lua b/lib/awful/screen.lua
index 4029895b6..6c1ab7c3c 100644
--- a/lib/awful/screen.lua
+++ b/lib/awful/screen.lua
@@ -135,7 +135,7 @@ function screen.focus_bydirection(dir, _screen)
     if sel then
         local geomtbl = {}
         for s in capi.screen do
-            geomtbl[s] = capi.screen[s].geometry
+            geomtbl[s] = s.geometry
         end
         local target = grect.get_in_direction(dir, geomtbl, sel.geometry)
         if target then