diff --git a/apps/shared/editable_cell_table_view_controller.cpp b/apps/shared/editable_cell_table_view_controller.cpp
index 3659b2c99..586bf2e6d 100644
--- a/apps/shared/editable_cell_table_view_controller.cpp
+++ b/apps/shared/editable_cell_table_view_controller.cpp
@@ -115,7 +115,15 @@ void EditableCellTableViewController::didBecomeFirstResponder() {
 
 void EditableCellTableViewController::viewWillAppear() {
   TabTableController::viewWillAppear();
-  selectCellAtLocation(0,1);
+  if (selectedRow() == -1) {
+    selectCellAtLocation(0, 1);
+  } else {
+    int selRow = selectedRow();
+    selRow = selRow >= numberOfRows() ? numberOfRows()-1 : selRow;
+    int selColumn = selectedColumn();
+    selColumn = selColumn >= numberOfColumns() ? numberOfColumns() - 1 : selColumn;
+    selectCellAtLocation(selColumn, selRow);
+  }
 }
 
 TextFieldDelegateApp * EditableCellTableViewController::textFieldDelegateApp() {