diff --git a/src/edit.c b/src/edit.c
index 35e4bc2c4b..9162fe6298 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -196,6 +196,10 @@ edit(
 #endif
 	ins_apply_autocmds(EVENT_INSERTENTER);
 
+	// Check for changed highlighting, e.g. for ModeMsg.
+	if (need_highlight_changed)
+	    highlight_changed();
+
 	// Make sure the cursor didn't move.  Do call check_cursor_col() in
 	// case the text was modified.  Since Insert mode was not started yet
 	// a call to check_cursor_col() may move the cursor, especially with
diff --git a/src/version.c b/src/version.c
index d9d8104afe..fa3ce6f5e4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2418,
 /**/
     2417,
 /**/