diff --git a/src/version.c b/src/version.c
index f19fbbaaff..dc85d40a6d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    227,
 /**/
     226,
 /**/
diff --git a/src/window.c b/src/window.c
index 40aa2f062b..28b9660b84 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2084,6 +2084,13 @@ win_close(win, free_buf)
     }
 #endif
 
+#ifdef FEAT_GUI
+    /* Avoid trouble with scrollbars that are going to be deleted in
+     * win_free(). */
+    if (gui.in_use)
+	out_flush();
+#endif
+
     /*
      * Close the link to the buffer.
      */
@@ -4174,7 +4181,6 @@ win_free(wp, tp)
 #ifdef FEAT_GUI
     if (gui.in_use)
     {
-	out_flush();
 	gui_mch_destroy_scrollbar(&wp->w_scrollbars[SBAR_LEFT]);
 	gui_mch_destroy_scrollbar(&wp->w_scrollbars[SBAR_RIGHT]);
     }