diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 22788e84b..ec81d4efd 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4031,15 +4031,18 @@ set_cairo_source_rgba_from_color(cairo_t *cr, guicolor_T color)
     void
 gui_mch_new_colors(void)
 {
-    if (gui.formwin != NULL && gtk_widget_get_window(gui.formwin) != NULL)
+    if (gui.drawarea != NULL
+#if GTK_CHECK_VERSION(3,22,2)
+	    && gui.formwin != NULL
+#endif
+	    && gtk_widget_get_window(gui.drawarea) != NULL)
     {
 #if !GTK_CHECK_VERSION(3,22,2)
-	GdkWindow * const da_win = gtk_widget_get_window(gui.formwin);
+	GdkWindow * const da_win = gtk_widget_get_window(gui.drawarea);
 #endif
-
 #if GTK_CHECK_VERSION(3,22,2)
-	GtkStyleContext * const context
-	    = gtk_widget_get_style_context(gui.formwin);
+	GtkStyleContext * const context =
+				     gtk_widget_get_style_context(gui.formwin);
 	GtkCssProvider * const provider = gtk_css_provider_new();
 	gchar * const css = g_strdup_printf(
 		"widget#vim-gtk-form {\n"
diff --git a/src/version.c b/src/version.c
index 7554fb3b7..8e2cf7837 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 */
+/**/
+    2119,
 /**/
     2118,
 /**/