diff --git a/src/syntax.c b/src/syntax.c
index 756d0ea656..8c23d20a31 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -9554,6 +9554,10 @@ set_hl_attr(
 	at_en.ae_u.cterm.bg_color = sgp->sg_cterm_bg;
 # ifdef FEAT_TERMGUICOLORS
 #  ifdef MSWIN
+#   ifdef VIMDLL
+	// Only when not using the GUI.
+	if (!gui.in_use && !gui.starting)
+#   endif
 	{
 	    int id;
 	    guicolor_T fg, bg;
diff --git a/src/version.c b/src/version.c
index 3699629210..0631f09b22 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1595,
 /**/
     1594,
 /**/