diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp
index cc43c3c0b..b9818d01f 100644
--- a/apps/calculation/history_controller.cpp
+++ b/apps/calculation/history_controller.cpp
@@ -161,13 +161,13 @@ void HistoryController::tableViewDidChangeSelectionAndDidScroll(SelectableTableV
     setSelectedSubviewType(SubviewType::Input, false, previousSelectedCellX, previousSelectedCellY);
   } else {
     HistoryViewCell * selectedCell = (HistoryViewCell *)(t->selectedCell());
-    if (selectedSubviewType() == SubviewType::Ellipsis && selectedCell->additionalInformationType() == Calculation::AdditionalInformationType::None) {
-      setSelectedSubviewType(SubviewType::Output, false, previousSelectedCellX, previousSelectedCellY);
-    }
     SubviewType nextSelectedSubviewType = selectedSubviewType();
     if (selectedCell && !selectedCell->displaysSingleLine()) {
       nextSelectedSubviewType = previousSelectedCellY < selectedRow() ? SubviewType::Input : SubviewType::Output;
     }
+    if (nextSelectedSubviewType == SubviewType::Ellipsis && selectedCell->additionalInformationType() == Calculation::AdditionalInformationType::None) {
+      nextSelectedSubviewType = SubviewType::Output;
+    }
     setSelectedSubviewType(nextSelectedSubviewType, false, previousSelectedCellX, previousSelectedCellY);
   }
   // The selectedCell may change during setSelectedSubviewType