2 files changed, 15 insertions, 3 deletions
diff --git a/Applications/Terminal/TerminalWidget.cpp b/Applications/Terminal/TerminalWidget.cpp
index ce59aa7677..d08094263d 100644
--- a/Applications/Terminal/TerminalWidget.cpp
+++ b/Applications/Terminal/TerminalWidget.cpp
@@ -177,7 +177,7 @@ void TerminalWidget::keydown_event(GKeyEvent& event)
         auto min_selection_row = min(m_selection_start.row(), m_selection_end.row());
         auto max_selection_row = max(m_selection_start.row(), m_selection_end.row());
 
-        if (future_cursor_column <= max(m_selection_start.column(), m_selection_end.column()) && m_terminal.cursor_row() >= min_selection_row && m_terminal.cursor_row() <= max_selection_row) {
+        if (future_cursor_column <= last_selection_column_on_row(m_terminal.cursor_row()) && m_terminal.cursor_row() >= min_selection_row && m_terminal.cursor_row() <= max_selection_row) {
             m_selection_end = {};
             update();
         }
@@ -464,8 +464,8 @@ String TerminalWidget::selected_text() const
     auto end = normalized_selection_end();
 
     for (int row = start.row(); row <= end.row(); ++row) {
-        int first_column = row == start.row() ? start.column() : 0;
-        int last_column = row == end.row() ? end.column() : m_terminal.columns() - 1;
+        int first_column = first_selection_column_on_row(row);
+        int last_column = last_selection_column_on_row(row);
         for (int column = first_column; column <= last_column; ++column) {
             auto& line = m_terminal.line(row);
             if (line.attributes[column].is_untouched()) {
@@ -482,6 +482,16 @@ String TerminalWidget::selected_text() const
     return builder.to_string();
 }
 
+int TerminalWidget::first_selection_column_on_row(int row) const
+{
+    return row == normalized_selection_start().row() ? normalized_selection_start().column() : 0;
+}
+
+int TerminalWidget::last_selection_column_on_row(int row) const
+{
+    return row == normalized_selection_end().row() ? normalized_selection_end().column() : m_terminal.columns() - 1;
+}
+
 void TerminalWidget::terminal_history_changed()
 {
     bool was_max = m_scrollbar->value() == m_scrollbar->max();
diff --git a/Applications/Terminal/TerminalWidget.h b/Applications/Terminal/TerminalWidget.h
index e4c7b0ba26..4307c45d29 100644
--- a/Applications/Terminal/TerminalWidget.h
+++ b/Applications/Terminal/TerminalWidget.h
@@ -66,6 +66,8 @@ private:
     void invalidate_cursor();
 
     Size compute_base_size() const;
+    int first_selection_column_on_row(int row) const;
+    int last_selection_column_on_row(int row) const;
 
     VT::Terminal m_terminal;