diff --git a/apps/shared/store_controller.cpp b/apps/shared/store_controller.cpp
index a7e360236..02c60d582 100644
--- a/apps/shared/store_controller.cpp
+++ b/apps/shared/store_controller.cpp
@@ -97,6 +97,16 @@ bool StoreController::textFieldDidFinishEditing(TextField * textField, const cha
   return true;
 }
 
+bool StoreController::textFieldDidAbortEditing(TextField * textField) {
+  if (textField == contentView()->formulaInputView()->textField()) {
+    contentView()->displayFormulaInput(false);
+    app()->setFirstResponder(contentView());
+    return true;
+  }
+  return EditableCellTableViewController::textFieldDidAbortEditing(textField);
+}
+
+
 int StoreController::numberOfColumns() {
   return FloatPairStore::k_numberOfColumnsPerSeries * FloatPairStore::k_numberOfSeries;
 }
diff --git a/apps/shared/store_controller.h b/apps/shared/store_controller.h
index 9164c1044..d04a7028b 100644
--- a/apps/shared/store_controller.h
+++ b/apps/shared/store_controller.h
@@ -21,6 +21,7 @@ public:
 
   // TextFieldDelegate
   bool textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) override;
+  bool textFieldDidAbortEditing(TextField * textField) override;
 
   // TableViewDataSource
   int numberOfColumns() override;