diff --git a/src/ex_getln.c b/src/ex_getln.c
index 22f1cf6..40b8886 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -2390,7 +2390,7 @@
 	    trigger_cmd_autocmd(cmdline_type, EVENT_CMDLINECHANGED);
 
 #ifdef FEAT_SEARCH_EXTRA
-	if (xpc.xp_context == EXPAND_NOTHING)
+	if (xpc.xp_context == EXPAND_NOTHING && (KeyTyped || vpeekc() == NUL))
 	    may_do_incsearch_highlighting(firstc, count, &is_state);
 #endif
 
diff --git a/src/version.c b/src/version.c
index 190059e..945d8e9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3225,
+/**/
     3224,
 /**/
     3223,