diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 75a0db3e3b..4d74a3f84e 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1488,9 +1488,6 @@ static char *find_excmd_after_range(exarg_T *eap)
   // Save location after command modifiers.
   char *cmd = eap->cmd;
   eap->cmd = skip_range(eap->cmd, NULL);
-  if (*eap->cmd == '*') {
-    eap->cmd = skipwhite(eap->cmd + 1);
-  }
   char *p = find_ex_command(eap, NULL);
   eap->cmd = cmd;  // Restore original position for address parsing
   return p;
@@ -3422,6 +3419,11 @@ char *skip_range(const char *cmd, int *ctx)
   // Skip ":" and white space.
   cmd = skip_colon_white(cmd, false);
 
+  // Skip "*" used for Visual range.
+  if (*cmd == '*') {
+    cmd = skipwhite(cmd + 1);
+  }
+
   return (char *)cmd;
 }