diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp
index 694374f02..6e437fce0 100644
--- a/apps/calculation/history_controller.cpp
+++ b/apps/calculation/history_controller.cpp
@@ -127,7 +127,7 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
       Container::activeApp()->setFirstResponder(parentResponder());
       return true;
     }
-    m_selectableTableView.selectCellAtLocation(0, (focusRow > 0) * (focusRow - 1));
+    m_selectableTableView.selectCellAtLocation(0, focusRow > 0 ? focusRow - 1 : 0);
     tableViewDidChangeSelection(&m_selectableTableView, 0, (subviewType == SubviewType::Input) ? selectedRow() : -1);
     m_selectableTableView.scrollToCell(0, selectedRow());
     return true;