diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index c3a01df..7509fe0 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3515,8 +3515,11 @@ set_one_cmd_context(xp, buff)
     else
     {
 	p = cmd;
-	while (ASCII_ISALPHA(*p) || *p == '*')    /* Allow * wild card */
+	if (ASCII_ISALPHA(*p) || *p == '*') {    /* Allow * wild card */
 	    ++p;
+	    while (ASCII_ISALNUM(*p) || *p == '*')
+		++p;
+	}
 	/* check for non-alpha command */
 	if (p == cmd && vim_strchr((char_u *)"@*!=><&~#", *p) != NULL)
 	    ++p;