diff --git a/builtins/src/main/java/org/jline/builtins/Nano.java b/builtins/src/main/java/org/jline/builtins/Nano.java
index f694c2e29..c378f6079 100644
--- a/builtins/src/main/java/org/jline/builtins/Nano.java
+++ b/builtins/src/main/java/org/jline/builtins/Nano.java
@@ -421,7 +421,7 @@ void moveToChar(int pos, CursorMovement move) {
             if (lines.get(line).contains("\t")) {
                 int cpos = charPosition(pos, move);
                 pos = new AttributedStringBuilder().tabs(tabs).append(lines.get(line)).columnLength();
-                if (cpos < pos) {
+                if (cpos < lines.get(line).length()) {
                     pos = new AttributedStringBuilder().tabs(tabs).append(lines.get(line).substring(0, cpos)).columnLength();
                 }
             }