diff --git a/src/popupwin.c b/src/popupwin.c
index 59a0bdf78a..296441b11b 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -3855,6 +3855,11 @@ update_popups(void (*win_update)(win_T *wp))
 	// Back to the normal zindex.
 	screen_zindex = 0;
     }
+
+#if defined(FEAT_SEARCH_EXTRA)
+    // In case win_update() called start_search_hl().
+    end_search_hl();
+#endif
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index 424234b9a0..f0cfe69a31 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1221,
 /**/
     1220,
 /**/