diff --git a/CHANGELOG.md b/CHANGELOG.md
index 365c2d1c..6e6d0bad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Hyperlink preview not being shown when the terminal has exactly 2 lines
 - Crash on Windows when changing display scale factor
 - Freeze with some drivers when using GLX
+- Crash when shrinking the terminal scrolled into the history
 
 ## 0.12.1
 
diff --git a/alacritty_terminal/src/grid/resize.rs b/alacritty_terminal/src/grid/resize.rs
index 882c0c90..92ee55d7 100644
--- a/alacritty_terminal/src/grid/resize.rs
+++ b/alacritty_terminal/src/grid/resize.rs
@@ -368,6 +368,9 @@ impl<T: GridCell + Default + PartialEq + Clone> Grid<T> {
         reversed.truncate(self.max_scroll_limit + self.lines);
         self.raw.replace_inner(reversed);
 
+        // Clamp display offset in case some lines went off.
+        self.display_offset = min(self.display_offset, self.history_size());
+
         // Reflow the primary cursor, or clamp it if reflow is disabled.
         if !reflow {
             self.cursor.point.column = min(self.cursor.point.column, Column(columns - 1));