diff --git a/cmd.c b/cmd.c
index dd1a0a7b..991e079b 100644
--- a/cmd.c
+++ b/cmd.c
@@ -781,15 +781,15 @@ cmd_lookup_index(struct session *s, const char *name, int *ambiguous)
 	const char	*errstr;
 	u_int		 idx;
 
+	idx = strtonum(name, 0, INT_MAX, &errstr);
+	if (errstr == NULL)
+		return (idx);
+
 	if ((wl = cmd_lookup_window(s, name, ambiguous)) != NULL)
 		return (wl->idx);
 	if (*ambiguous)
 		return (-1);
 
-	idx = strtonum(name, 0, INT_MAX, &errstr);
-	if (errstr == NULL)
-		return (idx);
-
 	return (-1);
 }