diff --git a/src/version.c b/src/version.c
index f72ae97f28..403a6e474c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    309,
 /**/
     308,
 /**/
diff --git a/src/window.c b/src/window.c
index cea7c402d9..856e7c4596 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5710,8 +5710,9 @@ win_new_height(wp, height)
 		    --wp->w_wrow;
 		}
 	    }
+            set_topline(wp, lnum);
 	}
-	else
+	else if (sline > 0)
 	{
 	    while (sline > 0 && lnum > 1)
 	    {
@@ -5748,14 +5749,15 @@ win_new_height(wp, height)
 		lnum++;
 		wp->w_wrow -= line_size + sline;
 	    }
-	    else if (sline >= 0)
+	    else if (sline > 0)
 	    {
 		/* First line of file reached, use that as topline. */
 		lnum = 1;
 		wp->w_wrow -= sline;
 	    }
+
+            set_topline(wp, lnum);
 	}
-	set_topline(wp, lnum);
     }
 
     if (wp == curwin)