diff --git a/src/highlight.c b/src/highlight.c
index df34f03075..b768787eec 100644
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -4371,8 +4371,14 @@ highlight_changed(void)
 	}
     }
 
+    // Highlight ids may have been changed, so keep windows up to date
     FOR_ALL_WINDOWS(wp)
-	wp->w_hlfwin_id = hlf_get_id(wp, HLF_WIN);
+    {
+	char *errmsg = update_winhighlight(wp, wp->w_p_whl);
+
+	if (errmsg != NULL)
+	    emsg(_(errmsg));
+    }
 
 #ifdef FEAT_TERMINAL
     term_update_hlfwin_all();
@@ -5480,7 +5486,6 @@ update_highlight_overrides(hl_override_T *old, hl_override_T *hl_new, int newlen
 	{
 	    set->arr = hl_new;
 	    set->len = newlen;
-	    break;
 	}
     }
 }
diff --git a/src/version.c b/src/version.c
index 79a30caba3..028abc2f08 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    138,
 /**/
     137,
 /**/