diff --git a/apps/calculation/additional_outputs/expressions_list_controller.cpp b/apps/calculation/additional_outputs/expressions_list_controller.cpp
index de98173d2..be0212561 100644
--- a/apps/calculation/additional_outputs/expressions_list_controller.cpp
+++ b/apps/calculation/additional_outputs/expressions_list_controller.cpp
@@ -29,6 +29,9 @@ void ExpressionsListController::viewDidDisappear() {
   // Reset layout and cell memoization to avoid taking extra space in the pool
   for (int i = 0; i < k_maxNumberOfRows; i++) {
     m_cells[i].setLayout(Layout());
+    /* By reseting m_layouts, numberOfRow will go down to 0, and the highlighted
+     * cells won't be unselected. Therefore we unselect them here. */
+    m_cells[i].setHighlighted(false);
     m_layouts[i] = Layout();
   }
   m_expression = Expression();