diff --git a/src/window.c b/src/window.c
index f031989..fd732f2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5830,10 +5830,11 @@
     // Don't change w_topline in any of these cases:
     // - window height is 0
     // - 'scrollbind' is set and this isn't the current window
-    // - window height is sufficient to display the whole buffer
+    // - window height is sufficient to display the whole buffer and first line
+    //   is visible.
     if (height > 0
         && (!wp->w_p_scb || wp == curwin)
-        && (height < wp->w_buffer->b_ml.ml_line_count))
+        && (height < wp->w_buffer->b_ml.ml_line_count || wp->w_topline > 1))
     {
 	/*
 	 * Find a value for w_topline that shows the cursor at the same