diff --git a/src/misc1.c b/src/misc1.c
index 23a1c1e4ba..bb15d429d6 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2886,6 +2886,13 @@ changed_common(lnum, col, lnume, xtra)
 		    }
 #endif
 		}
+
+#ifdef FEAT_FOLDING
+	    /* Take care of side effects for setting w_topline when folds have
+	     * changed.  Esp. when the buffer was changed in another window. */
+	    if (hasAnyFolding(wp))
+		set_topline(wp, wp->w_topline);
+#endif
 	}
     }
 
diff --git a/src/version.c b/src/version.c
index 83af0958b3..8a71cbe39e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    284,
 /**/
     283,
 /**/