diff --git a/src/misc1.c b/src/misc1.c
index 23a1c1e..bb15d42 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2886,6 +2886,13 @@
 		    }
 #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
 	}
     }