diff --git a/lib/aethyr/core/render/display.rb b/lib/aethyr/core/render/display.rb
index 1a6a5d8ae216daa7864aca5190852bc5efb468f6..9f9bceea42b45dcca5a6b38742208036488a163f 100644
--- a/lib/aethyr/core/render/display.rb
+++ b/lib/aethyr/core/render/display.rb
@@ -551,7 +551,7 @@ CONF
         when Ncurses::KEY_LEFT
           cursor_pos = [0, cursor_pos-1].max
         when Ncurses::KEY_RIGHT
-          cursor_pos = [max_len, cursor_pos + 1].min
+          cursor_pos = [max_len, cursor_pos + 1, string.length].min
           # similar, implement yourself !
   #      when Ncurses::KEY_ENTER, ?\n, ?\r
   #        return string, cursor_pos, ch # Which return key has been used?