diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp
index bcaa408da..37cd3c772 100644
--- a/apps/calculation/edit_expression_controller.cpp
+++ b/apps/calculation/edit_expression_controller.cpp
@@ -158,8 +158,8 @@ bool EditExpressionController::inputViewDidFinishEditing(const char * text, Ion:
   m_calculationStore->push(textBody(), calculationApp->localContext());
   m_historyController->reload();
   ((ContentView *)view())->mainView()->scrollToCell(0, m_historyController->numberOfRows()-1);
-  ((ContentView *)view())->textField()->setEditing(true);
-  ((ContentView *)view())->textField()->setText("");
+  ((ContentView *)view())->editableExpressionView()->setEditing(true);
+  ((ContentView *)view())->editableExpressionView()->setText("");
   return true;
 }