diff --git a/apps/shared/store_controller.cpp b/apps/shared/store_controller.cpp
index fad5b0a30..2a2795d70 100644
--- a/apps/shared/store_controller.cpp
+++ b/apps/shared/store_controller.cpp
@@ -62,6 +62,13 @@ void StoreController::displayFormulaInput() {
   contentView()->displayFormulaInput(true);
 }
 
+bool StoreController::textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) {
+  if (textField == contentView()->formulaInputView()->textField()) {
+    return event == Ion::Events::OK || event == Ion::Events::EXE;
+  }
+  return EditableCellTableViewController::textFieldShouldFinishEditing(textField, event);
+}
+
 bool StoreController::textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) {
   if (textField == contentView()->formulaInputView()->textField()) {
     // Handle formula input
diff --git a/apps/shared/store_controller.h b/apps/shared/store_controller.h
index c8498ad17..233520df7 100644
--- a/apps/shared/store_controller.h
+++ b/apps/shared/store_controller.h
@@ -20,6 +20,7 @@ public:
   virtual void fillColumnWithFormula(Poincare::Expression * formula) = 0;
 
   // TextFieldDelegate
+  bool textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) override;
   bool textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) override;
   bool textFieldDidAbortEditing(TextField * textField) override;