diff --git a/src/input_handler.cc b/src/input_handler.cc
index 664490d6..2564529a 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -1820,21 +1820,15 @@ void scroll_window(Context& context, LineCount offset, bool mouse_dragging)
     SelectionList& selections = context.selections();
     Selection& main_selection = selections.main();
     const BufferCoord anchor = main_selection.anchor();
-    const BufferCoord cursor = main_selection.cursor();
+    const BufferCoordAndTarget cursor = main_selection.cursor();
 
     auto cursor_off = mouse_dragging ? win_pos.line - window.position().line : 0;
 
     auto line = clamp(cursor.line + cursor_off, win_pos.line + scrolloff.line,
                       win_pos.line + win_dim.line - 1 - scrolloff.line);
-    line = clamp(line, 0_line, buffer.line_count() - 1);
 
-    using std::min; using std::max;
-    // This is not exactly a clamp, and must be done in this order as
-    // byte_count_to could return line length
-    auto col = min(max(cursor.column, buffer[line].byte_count_to(win_pos.column)),
-                   buffer[line].length()-1);
-
-    BufferCoord new_cursor = { line, col };
+    const ColumnCount tabstop = context.options()["tabstop"].get<int>();
+    auto new_cursor = buffer.offset_coord(cursor, line - cursor.line, tabstop);
     BufferCoord new_anchor = (mouse_dragging or new_cursor == cursor) ? anchor : new_cursor;
 
     window.set_position(win_pos);
diff --git a/test/regression/4839-scroll-invalid-cursor/cmd b/test/regression/4839-scroll-invalid-cursor/cmd
new file mode 100644
index 00000000..ec0f73a0
--- /dev/null
+++ b/test/regression/4839-scroll-invalid-cursor/cmd
@@ -0,0 +1 @@
+l<pagedown>
diff --git a/test/regression/4839-scroll-invalid-cursor/in b/test/regression/4839-scroll-invalid-cursor/in
new file mode 100644
index 00000000..3c2a5cb8
--- /dev/null
+++ b/test/regression/4839-scroll-invalid-cursor/in
@@ -0,0 +1,23 @@
+ab
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
+😃
diff --git a/test/regression/4839-scroll-invalid-cursor/script b/test/regression/4839-scroll-invalid-cursor/script
new file mode 100644
index 00000000..03227629
--- /dev/null
+++ b/test/regression/4839-scroll-invalid-cursor/script
@@ -0,0 +1,2 @@
+ui_out -ignore 1
+ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "underline": "default", "attributes": [] }, "contents": "😃" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "\u000a" }]], { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }] }'