diff --git a/apps/shared/editable_cell_table_view_controller.cpp b/apps/shared/editable_cell_table_view_controller.cpp
index c39ab9423..3e9fea220 100644
--- a/apps/shared/editable_cell_table_view_controller.cpp
+++ b/apps/shared/editable_cell_table_view_controller.cpp
@@ -45,10 +45,7 @@ bool EditableCellTableViewController::textFieldDidFinishEditing(TextField * text
 
 int EditableCellTableViewController::numberOfRows() {
   int numberOfModelElements = numberOfElements();
-  if (numberOfModelElements >= maxNumberOfElements()) {
-    return 1 + numberOfModelElements;
-  }
-  return 2 + numberOfModelElements;
+  return 1 + numberOfModelElements + (numberOfModelElements < maxNumberOfElements());
 }
 
 KDCoordinate EditableCellTableViewController::rowHeight(int j) {