diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ca6a9f8..dc220abf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fix panic which could occur when quitting Alacritty on Windows if using the Conpty backend
 - Automatic copying of selection to clipboard when mouse is released outside of Alacritty
+- Scrollback history live reload only working when shrinking lines
+- Crash when decreasing scrollback history in config while scrolled in history
 
 ## Version 0.2.9
 
diff --git a/src/grid/mod.rs b/src/grid/mod.rs
index fd22b716..7766f9a9 100644
--- a/src/grid/mod.rs
+++ b/src/grid/mod.rs
@@ -163,7 +163,9 @@ impl<T: Copy + Clone> Grid<T> {
     pub fn update_history(&mut self, history_size: usize, template: &T)
     {
         self.raw.update_history(history_size, Row::new(self.cols, &template));
+        self.max_scroll_limit = history_size;
         self.scroll_limit = min(self.scroll_limit, history_size);
+        self.display_offset = min(self.display_offset, self.scroll_limit);
     }
 
     pub fn scroll_display(&mut self, scroll: Scroll) {