diff --git a/src/main/scala/ocelot/desktop/ui/widget/TextInput.scala b/src/main/scala/ocelot/desktop/ui/widget/TextInput.scala
index f2aca76..50c2f53 100644
--- a/src/main/scala/ocelot/desktop/ui/widget/TextInput.scala
+++ b/src/main/scala/ocelot/desktop/ui/widget/TextInput.scala
@@ -71,6 +71,7 @@ class TextInput(val initialText: String = "") extends Widget with MouseHandler w
   def text_=(value: String): Unit = {
     _text.chars = value.codePoints().toArray
     selector.active = false
+    cursor.position = cursor.position max 0 min _text.chars.length
   }
 
   private def selectedText: String = new String(_text.chars, selector.start, selector.length)