diff --git a/src/version.c b/src/version.c
index 1a9671db7f..dd38ef7d9c 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 */
+/**/
+    98,
 /**/
     97,
 /**/
diff --git a/src/window.c b/src/window.c
index bfca2c345a..694c2c029b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1613,11 +1613,14 @@ win_init(win_T *newp, win_T *oldp, int flags UNUSED)
     win_init_some(newp, oldp);
 
 #ifdef FEAT_TERMINAL
-    // Make sure to also handle highlight overrides copied over from oldp.
-    push_highlight_overrides(newp->w_hl, newp->w_hl_len);
-    if (newp->w_buffer->b_term != NULL)
-	term_init_default_colors(newp->w_buffer->b_term);
-    pop_highlight_overrides();
+    {
+	// Make sure to also handle highlight overrides copied over from oldp.
+	bool pushed = push_highlight_overrides(newp->w_hl, newp->w_hl_len);
+	if (newp->w_buffer->b_term != NULL)
+	    term_init_default_colors(newp->w_buffer->b_term);
+	if (pushed)
+	    pop_highlight_overrides();
+    }
 #endif
 }