diff --git a/src/buffer.rs b/src/buffer.rs
index b8a8be2..7008872 100644
--- a/src/buffer.rs
+++ b/src/buffer.rs
@@ -199,11 +199,11 @@ impl Buffer {
     }
 
     pub fn clamped_cursor(&self, cursor: Cursor) -> Cursor {
+        let line_end = self.text.line(cursor.line).len_chars().saturating_sub(1);
+
         Cursor {
             line: cursor.line,
-            column: cursor
-                .column
-                .min(self.text.line(cursor.line).len_chars() - 1),
+            column: cursor.column.min(line_end),
         }
     }