diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index a6bdac3..2c35c8e 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3482,6 +3482,11 @@
 		break;
 	    }
 
+	// Not not recognize ":*" as the star command unless '*' is in
+	// 'cpoptions'.
+	if (eap->cmdidx == CMD_star && vim_strchr(p_cpo, CPO_STAR) == NULL)
+	    p = eap->cmd;
+
 	// Look for a user defined command as a last resort.  Let ":Print" be
 	// overruled by a user defined command.
 	if ((eap->cmdidx == CMD_SIZE || eap->cmdidx == CMD_Print)