diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp
index 7b60010a2..0e17a0bcf 100644
--- a/apps/calculation/edit_expression_controller.cpp
+++ b/apps/calculation/edit_expression_controller.cpp
@@ -111,9 +111,6 @@ void EditExpressionController::layoutFieldDidChangeSize(::LayoutField * layoutFi
 void EditExpressionController::reloadView() {
   m_contentView.reload();
   m_historyController->reload();
-  if (m_historyController->numberOfRows() > 0) {
-    m_contentView.mainView()->scrollToCell(0, m_historyController->numberOfRows()-1);
-  }
 }
 
 bool EditExpressionController::inputViewDidReceiveEvent(Ion::Events::Event event, bool shouldDuplicateLastCalculation) {
@@ -126,7 +123,6 @@ bool EditExpressionController::inputViewDidReceiveEvent(Ion::Events::Event event
     }
     m_calculationStore->push(m_cacheBuffer, myApp->localContext());
     m_historyController->reload();
-    m_contentView.mainView()->scrollToCell(0, m_historyController->numberOfRows()-1);
     return true;
   }
   if (event == Ion::Events::Up) {
@@ -150,7 +146,6 @@ bool EditExpressionController::inputViewDidFinishEditing(const char * text, Layo
   }
   m_calculationStore->push(m_cacheBuffer, textFieldDelegateApp()->localContext());
   m_historyController->reload();
-  m_contentView.mainView()->scrollToCell(0, m_historyController->numberOfRows()-1);
   m_contentView.expressionField()->setEditing(true, true);
   return true;
 }
diff --git a/apps/calculation/edit_expression_controller.h b/apps/calculation/edit_expression_controller.h
index 2fadd126d..298f0def2 100644
--- a/apps/calculation/edit_expression_controller.h
+++ b/apps/calculation/edit_expression_controller.h
@@ -10,7 +10,6 @@
 #include "calculation_store.h"
 
 namespace Calculation {
-class HistoryController;
 
 /* TODO: implement a split view */
 class EditExpressionController : public ViewController, public Shared::TextFieldDelegate, public Shared::LayoutFieldDelegate {
diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp
index 2f300aaef..b3fb5b2ce 100644
--- a/apps/calculation/history_controller.cpp
+++ b/apps/calculation/history_controller.cpp
@@ -20,6 +20,13 @@ HistoryController::HistoryController(Responder * parentResponder, CalculationSto
 
 void HistoryController::reload() {
   m_selectableTableView.reloadData();
+  /* TODO
+   * Replace the following by selectCellAtLocation in order to avoid laying out
+   * the table view twice.
+   */
+  if (numberOfRows() > 0) {
+    m_selectableTableView.scrollToCell(0, numberOfRows()-1);
+  }
 }
 
 void HistoryController::didBecomeFirstResponder() {