diff --git a/escher/src/text_field.cpp b/escher/src/text_field.cpp
index 7f5fa13f9..6dc189111 100644
--- a/escher/src/text_field.cpp
+++ b/escher/src/text_field.cpp
@@ -380,6 +380,9 @@ void TextField::scrollToAvoidWhiteSpace() {
   }
   KDCoordinate cursorWidth = m_contentView.subviewAtIndex(0)->minimalSizeForOptimalDisplay().width();
   m_manualScrolling = textLength() * m_contentView.charWidth()+cursorWidth-bounds().width();
+  if (m_manualScrolling < 0) {
+    m_manualScrolling = 0;
+  }
   setContentOffset(KDPoint(m_manualScrolling, 0));
 }