diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2eab13eb..658e0c1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,10 +89,13 @@
   opaque and non-opaque at runtime (using OSC-11).
 * Regression: crash when resizing the window when `resize-delay-ms >
   0` ([#1377][1377]).
+* Crash when scrolling up while running something that generates a lot
+  of output (for example, `yes`) ([#1380][1380]).
 
 [1317]: https://codeberg.org/dnkl/foot/issues/1317
 [1355]: https://codeberg.org/dnkl/foot/issues/1355
 [1377]: https://codeberg.org/dnkl/foot/issues/1377
+[1380]: https://codeberg.org/dnkl/foot/issues/1380
 
 
 ### Security
diff --git a/terminal.c b/terminal.c
index 3beffcf3..815dc2d4 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2714,6 +2714,7 @@ term_scroll_partial(struct terminal *term, struct scroll_region region, int rows
     term->grid->offset &= term->grid->num_rows - 1;
 
     if (likely(view_follows)) {
+        term_damage_scroll(term, DAMAGE_SCROLL, region, rows);
         selection_view_down(term, term->grid->offset);
         term->grid->view = term->grid->offset;
     } else if (unlikely(rows > view_sb_start_distance)) {
@@ -2737,13 +2738,12 @@ term_scroll_partial(struct terminal *term, struct scroll_region region, int rows
         erase_line(term, row);
     }
 
+    term->grid->cur_row = grid_row(term->grid, term->grid->cursor.point.row);
+
 #if defined(_DEBUG)
     for (int r = 0; r < term->rows; r++)
         xassert(grid_row(term->grid, r) != NULL);
 #endif
-
-    term_damage_scroll(term, DAMAGE_SCROLL, region, rows);
-    term->grid->cur_row = grid_row(term->grid, term->grid->cursor.point.row);
 }
 
 void
@@ -2800,6 +2800,7 @@ term_scroll_reverse_partial(struct terminal *term,
     xassert(term->grid->offset < term->grid->num_rows);
 
     if (view_follows) {
+        term_damage_scroll(term, DAMAGE_SCROLL_REVERSE, region, rows);
         selection_view_up(term, term->grid->offset);
         term->grid->view = term->grid->offset;
     }
@@ -2818,7 +2819,6 @@ term_scroll_reverse_partial(struct terminal *term,
         erase_line(term, row);
     }
 
-    term_damage_scroll(term, DAMAGE_SCROLL_REVERSE, region, rows);
     term->grid->cur_row = grid_row(term->grid, term->grid->cursor.point.row);
 
 #if defined(_DEBUG)