diff --git a/src/reader/reader.rs b/src/reader/reader.rs
index 32d82f368..157a62cd0 100644
--- a/src/reader/reader.rs
+++ b/src/reader/reader.rs
@@ -3607,8 +3607,11 @@ fn handle_readline_command(&mut self, c: ReadlineCmd) {
                         true,
                     );
                     if !is_kill {
-                        let pos = self.edit_line(elt).position();
-                        self.update_buff_pos(elt, Some(pos + 1));
+                        let el = self.edit_line(elt);
+                        let pos = el.position();
+                        if pos < el.len() {
+                            self.update_buff_pos(elt, Some(pos + 1));
+                        }
                     }
                 }
             }