diff --git a/src/move.c b/src/move.c
index 36cdbdfac5d2a296e8cace4adb5b7ff41d0b7083..bf3cfed91bd57ad0391eee263ff3726c3e8457fb 100644
--- a/src/move.c
+++ b/src/move.c
@@ -482,11 +482,12 @@ void do_down(bool scroll_only)
 	/* Reduce the amount when there are overlong lines at the top. */
 	for (enough = 1; enough < amount; enough++) {
 	    amount -= strlenpt(topline->data) / COLS;
-	    if (amount <= 0) {
+	    if (amount > 0)
+		topline = topline->next;
+	    if (amount < enough) {
 		amount = enough;
 		break;
 	    }
-	    topline = topline->next;
 	}
     }
 #endif