diff --git a/lib/awful/tag.lua.in b/lib/awful/tag.lua.in
index 00961946..b23310bb 100644
--- a/lib/awful/tag.lua.in
+++ b/lib/awful/tag.lua.in
@@ -316,7 +316,7 @@ function withcurrent(c, startup)
             c:tags(c.transient_for:tags())
         end
         if #c:tags() == 0 then
-            c:tags(selectedlist(c.screen))
+            c:tags(selectedlist(capi.mouse.screen))
         end
     end
 end