diff --git a/apps/calculation/additional_outputs/list_controller.cpp b/apps/calculation/additional_outputs/list_controller.cpp
index a7ebab267..16f9c9ef6 100644
--- a/apps/calculation/additional_outputs/list_controller.cpp
+++ b/apps/calculation/additional_outputs/list_controller.cpp
@@ -38,7 +38,6 @@ bool ListController::handleEvent(Ion::Events::Event event) {
      * insertTextBody. */
     Container::activeApp()->dismissModalViewController();
     m_editExpressionController->insertTextBody(buffer);
-    Container::activeApp()->setFirstResponder(m_editExpressionController);
     return true;
   }
   return false;
diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp
index 5e69bfee8..b0eb752c9 100644
--- a/apps/calculation/edit_expression_controller.cpp
+++ b/apps/calculation/edit_expression_controller.cpp
@@ -48,6 +48,7 @@ EditExpressionController::EditExpressionController(Responder * parentResponder,
 }
 
 void EditExpressionController::insertTextBody(const char * text) {
+  Container::activeApp()->setFirstResponder(this);
   m_contentView.expressionField()->handleEventWithText(text, false, true);
 }
 
diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp
index 251cc3a1f..5f7424105 100644
--- a/apps/calculation/history_controller.cpp
+++ b/apps/calculation/history_controller.cpp
@@ -78,11 +78,9 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
     EditExpressionController * editController = (EditExpressionController *)parentResponder();
     if (subviewType == SubviewType::Input) {
       m_selectableTableView.deselectTable();
-      Container::activeApp()->setFirstResponder(editController);
       editController->insertTextBody(calculationAtIndex(focusRow)->inputText());
     } else if (subviewType == SubviewType::Output) {
       m_selectableTableView.deselectTable();
-      Container::activeApp()->setFirstResponder(editController);
       Shared::ExpiringPointer<Calculation> calculation = calculationAtIndex(focusRow);
       ScrollableTwoExpressionsView::SubviewPosition outputSubviewPosition = selectedCell->outputView()->selectedSubviewPosition();
       if (outputSubviewPosition == ScrollableTwoExpressionsView::SubviewPosition::Right