diff --git a/apps/calculation/selectable_table_view.cpp b/apps/calculation/selectable_table_view.cpp
index 5103e1e9c..76b319594 100644
--- a/apps/calculation/selectable_table_view.cpp
+++ b/apps/calculation/selectable_table_view.cpp
@@ -42,7 +42,7 @@ void CalculationSelectableTableView::scrollToSubviewOfTypeOfCellAtLocation(Histo
   /* As we scroll, the selected calculation does not use the same history view
    * cell, thus, we want to deselect the previous used history view cell. */
   if (selectedRow() >= 0) {
-    HighlightCell * previousCell = cellAtLocation(selectedColumn(), selectedRow());
+    HighlightCell * previousCell = selectedCell();
     previousCell->setHighlighted(false);
   }
   /* Main part of the scroll */
diff --git a/apps/regression/calculation_controller.cpp b/apps/regression/calculation_controller.cpp
index 100adc82c..319c4c36b 100644
--- a/apps/regression/calculation_controller.cpp
+++ b/apps/regression/calculation_controller.cpp
@@ -43,7 +43,7 @@ void CalculationController::didBecomeFirstResponder() {
   if (selectableTableView()->selectedRow() == -1) {
     selectableTableView()->selectCellAtLocation(1, 0);
   } else {
-    selectableTableView()->selectCellAtLocation(selectableTableView()->selectedColumn(), selectableTableView()->selectedRow());
+    selectableTableView()->selectedCell();
   }
   TabTableController::didBecomeFirstResponder();
 }
@@ -64,7 +64,7 @@ void CalculationController::tableViewDidChangeSelection(SelectableTableView * t,
     }
   }
   if (t->selectedColumn() == 1 && t->selectedRow() >= 0 && t->selectedRow() < 6) {
-    EvenOddDoubleBufferTextCell * myCell = (EvenOddDoubleBufferTextCell *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
+    EvenOddDoubleBufferTextCell * myCell = (EvenOddDoubleBufferTextCell *)t->selectedCell();
     bool firstSubCellSelected = true;
     if (previousSelectedCellX == 1 && previousSelectedCellY >= 0 && previousSelectedCellY < 6) {
       EvenOddDoubleBufferTextCell * myPreviousCell = (EvenOddDoubleBufferTextCell *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY);
diff --git a/apps/settings/sub_controller.cpp b/apps/settings/sub_controller.cpp
index 44cc580d3..a4ea8925f 100644
--- a/apps/settings/sub_controller.cpp
+++ b/apps/settings/sub_controller.cpp
@@ -76,7 +76,7 @@ bool SubController::handleEvent(Ion::Events::Event event) {
       if (m_selectableTableView.selectedRow() == 1) {
         return false;
       }
-      MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.cellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow());
+      MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell();
       if (strcmp(myCell->accessoryText(), Ion::patchLevel()) == 0) {
         myCell->setAccessoryText(Ion::softwareVersion());
         return true;
diff --git a/apps/shared/editable_cell_table_view_controller.cpp b/apps/shared/editable_cell_table_view_controller.cpp
index f3e91a1e2..74b4d6370 100644
--- a/apps/shared/editable_cell_table_view_controller.cpp
+++ b/apps/shared/editable_cell_table_view_controller.cpp
@@ -54,7 +54,7 @@ void EditableCellTableViewController::tableViewDidChangeSelection(SelectableTabl
     }
   }
   if (cellAtLocationIsEditable(t->selectedColumn(), t->selectedRow())) {
-    EvenOddEditableTextCell * myCell = (EvenOddEditableTextCell *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
+    EvenOddEditableTextCell * myCell = (EvenOddEditableTextCell *)t->selectedCell();
     app()->setFirstResponder(myCell);
   }
 }
diff --git a/apps/shared/float_parameter_controller.cpp b/apps/shared/float_parameter_controller.cpp
index 5c0860f2f..4b90b7747 100644
--- a/apps/shared/float_parameter_controller.cpp
+++ b/apps/shared/float_parameter_controller.cpp
@@ -129,8 +129,7 @@ bool FloatParameterController::textFieldDidFinishEditing(TextField * textField,
   if (!setParameterAtIndex(selectableTableView()->selectedRow(), floatBody)) {
     return false;
   }
-  willDisplayCellForIndex(selectableTableView()->cellAtLocation(selectableTableView()->selectedColumn(),
-    selectableTableView()->selectedRow()), activeCell());
+  willDisplayCellForIndex(selectableTableView()->selectedCell(), activeCell());
   selectableTableView()->reloadData();
   if (event == Ion::Events::EXE || event == Ion::Events::OK) {
     selectableTableView()->selectCellAtLocation(selectableTableView()->selectedColumn(), selectableTableView()->selectedRow()+1);
@@ -157,12 +156,12 @@ void FloatParameterController::tableViewDidChangeSelection(SelectableTableView *
     myCell->setEditing(false);
   }
   if (t->selectedRow() == numberOfRows()-1) {
-    Button * myNewCell = (Button *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
+    Button * myNewCell = (Button *)t->selectedCell();
     app()->setFirstResponder(myNewCell);
     return;
   }
   if (t->selectedRow() >= 0) {
-    MessageTableCellWithEditableText * myNewCell = (MessageTableCellWithEditableText *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
+    MessageTableCellWithEditableText * myNewCell = (MessageTableCellWithEditableText *)t->selectedCell();
     app()->setFirstResponder(myNewCell);
   }
 }
diff --git a/apps/shared/range_parameter_controller.cpp b/apps/shared/range_parameter_controller.cpp
index 57c3b23f5..bc6b95e5d 100644
--- a/apps/shared/range_parameter_controller.cpp
+++ b/apps/shared/range_parameter_controller.cpp
@@ -78,7 +78,7 @@ void RangeParameterController::tableViewDidChangeSelection(SelectableTableView *
     }
   }
   if (t->selectedRow() == numberOfRows()-1) {
-    Button * myNewCell = (Button *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
+    Button * myNewCell = (Button *)t->selectedCell();
     app()->setFirstResponder(myNewCell);
     return;
   }