diff --git a/src/ex_getln.c b/src/ex_getln.c
index 0eb7d86..5614ea6 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1785,13 +1785,16 @@
 
 	if (c == K_COMMAND || c == K_SCRIPT_COMMAND)
 	{
+	    int	    clen = ccline.cmdlen;
 	    int	    cc_count = aucmd_cmdline_changed_count;
 
 	    if (do_cmdkey_command(c, DOCMD_NOWAIT) == OK)
 	    {
-		// Do not trigger CmdlineChanged below if the <Cmd> mapping
-		// already did that.
-		if (cc_count != aucmd_cmdline_changed_count)
+		// Do not trigger CmdlineChanged below if:
+		// - the length of the command line didn't change
+		// - the <Cmd> mapping already triggered the event
+		if (clen == ccline.cmdlen
+				    || cc_count != aucmd_cmdline_changed_count)
 		    trigger_cmdlinechanged = FALSE;
 		goto cmdline_changed;
 	    }
diff --git a/src/version.c b/src/version.c
index bfa0c5d..5e0bf4f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1040,
+/**/
     1039,
 /**/
     1038,