diff --git a/CHANGELOG.md b/CHANGELOG.md
index cceb5d0..6b75c48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - GUI programs launched by Alacritty starting in the background on X11
+- Text Cursor position when scrolling
 
 ## 0.3.3
 
diff --git a/alacritty_terminal/src/term/mod.rs b/alacritty_terminal/src/term/mod.rs
index 378b315..ee25727 100644
--- a/alacritty_terminal/src/term/mod.rs
+++ b/alacritty_terminal/src/term/mod.rs
@@ -436,7 +436,10 @@ impl<'a> Iterator for RenderableCellsIter<'a> {
                     let cell = Indexed {
                         inner: self.grid[self.cursor],
                         column: self.cursor.col,
-                        line: self.cursor.line,
+                        // Using `self.cursor.line` leads to inconsitent cursor position when
+                        // scrolling. See https://github.com/jwilm/alacritty/issues/2570 for more
+                        // info.
+                        line: self.inner.line(),
                     };
 
                     let mut renderable_cell =