diff --git a/escher/src/text_field.cpp b/escher/src/text_field.cpp
index 532bc506f..8b83d243c 100644
--- a/escher/src/text_field.cpp
+++ b/escher/src/text_field.cpp
@@ -77,7 +77,8 @@ int TextField::ContentView::bufferSize() {
 void TextField::ContentView::setText(const char * text) {
   if (m_isEditing) {
     strlcpy(m_draftTextBuffer, text, m_textBufferSize);
-    m_currentTextLength = strlen(text);
+    int textLength = strlen(text) >= m_textBufferSize ? m_textBufferSize-1 : strlen(text);
+    m_currentTextLength = textLength;
   } else {
     strlcpy(m_textBuffer, text, m_textBufferSize);
   }