diff --git a/apps/code/menu_controller.cpp b/apps/code/menu_controller.cpp
index cf148a5ee..8b25cb07d 100644
--- a/apps/code/menu_controller.cpp
+++ b/apps/code/menu_controller.cpp
@@ -373,7 +373,7 @@ bool MenuController::textFieldDidAbortEditing(TextField * textField) {
   return true;
 }
 
-bool MenuController::textFieldDidHandleEvent(TextField * textField, bool returnValue, bool textHasChanged) {
+bool MenuController::textFieldDidHandleEvent(TextField * textField, bool returnValue, bool textSizeDidChange) {
   int scriptExtensionLength = 1 + strlen(ScriptStore::k_scriptExtension);
   if (textField->isEditing() && textField->cursorLocation() > textField->draftTextLength() - scriptExtensionLength) {
     textField->setCursorLocation(textField->draftTextLength() - scriptExtensionLength);
diff --git a/apps/code/menu_controller.h b/apps/code/menu_controller.h
index 00c31356e..b4383549f 100644
--- a/apps/code/menu_controller.h
+++ b/apps/code/menu_controller.h
@@ -53,7 +53,7 @@ public:
   bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override;
   bool textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) override;
   bool textFieldDidAbortEditing(TextField * textField) override;
-  bool textFieldDidHandleEvent(TextField * textField, bool returnValue, bool textHasChanged) override;
+  bool textFieldDidHandleEvent(TextField * textField, bool returnValue, bool textSizeDidChange) override;
 
   /* ButtonRowDelegate */
   int numberOfButtons(ButtonRowController::Position position) const override { return 1; }
diff --git a/apps/probability/calculation_controller.cpp b/apps/probability/calculation_controller.cpp
index e7cb86b31..831c35283 100644
--- a/apps/probability/calculation_controller.cpp
+++ b/apps/probability/calculation_controller.cpp
@@ -187,8 +187,8 @@ void CalculationController::willDisplayCellAtLocation(HighlightCell * cell, int
   }
 }
 
-bool CalculationController::textFieldDidHandleEvent(::TextField * textField, bool returnValue, bool textHasChanged) {
-  if (returnValue && textHasChanged) {
+bool CalculationController::textFieldDidHandleEvent(::TextField * textField, bool returnValue, bool textSizeDidChange) {
+  if (returnValue && textSizeDidChange) {
     /* We do not reload the responder because the first responder might be the
      * toolbox (or the variable  box) and reloading the responder would corrupt
      * the first responder. */
diff --git a/apps/probability/calculation_controller.h b/apps/probability/calculation_controller.h
index b3ede0978..88df678b0 100644
--- a/apps/probability/calculation_controller.h
+++ b/apps/probability/calculation_controller.h
@@ -37,7 +37,7 @@ public:
   void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
 
   /* TextField delegate */
-  bool textFieldDidHandleEvent(TextField * textField, bool returnValue, bool textHasChanged) override;
+  bool textFieldDidHandleEvent(TextField * textField, bool returnValue, bool textSizeDidChange) override;
   bool textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) override;
   bool textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) override;
 
diff --git a/escher/include/escher/text_field_delegate.h b/escher/include/escher/text_field_delegate.h
index eae329dc5..2558f1062 100644
--- a/escher/include/escher/text_field_delegate.h
+++ b/escher/include/escher/text_field_delegate.h
@@ -9,7 +9,7 @@ public:
   virtual bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) = 0;
   virtual bool textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) { return false; };
   virtual bool textFieldDidAbortEditing(TextField * textField) {return false;};
-  virtual bool textFieldDidHandleEvent(TextField * textField, bool returnValue, bool textHasChanged) { return returnValue; };
+  virtual bool textFieldDidHandleEvent(TextField * textField, bool returnValue, bool textSizeDidChange) { return returnValue; };
 };
 
 #endif
diff --git a/escher/src/text_field.cpp b/escher/src/text_field.cpp
index cc63d1d58..aa0105bcd 100644
--- a/escher/src/text_field.cpp
+++ b/escher/src/text_field.cpp
@@ -419,7 +419,7 @@ bool TextField::handleEventWithText(const char * eventText, bool indentation, bo
 
   if (eventTextLength == 0) {
     setCursorLocation(0);
-    return m_delegate->textFieldDidHandleEvent(this, true, true);
+    return m_delegate->textFieldDidHandleEvent(this, true, previousTextLength != 0);
   }
 
   size_t eventTextSize = min(eventTextLength + 1, TextField::maxBufferSize());