diff --git a/apps/code/menu_controller.cpp b/apps/code/menu_controller.cpp
index 78adafc2f..80e8fd4af 100644
--- a/apps/code/menu_controller.cpp
+++ b/apps/code/menu_controller.cpp
@@ -273,7 +273,7 @@ void MenuController::willDisplayScriptTitleCellForIndex(HighlightCell * cell, in
 }
 
 void MenuController::tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY, bool withinTemporarySelection) {
-  if (!withinTemporarySelection && selectedRow() == numberOfRows() - 1 && selectedColumn() == 1 && m_shouldDisplayAddScriptRow) {
+  if (selectedRow() == numberOfRows() - 1 && selectedColumn() == 1 && m_shouldDisplayAddScriptRow) {
     t->selectCellAtLocation(0, numberOfRows()-1);
   }
 }
diff --git a/apps/shared/function_list_controller.cpp b/apps/shared/function_list_controller.cpp
index 9dfa8dce2..c2e9dee28 100644
--- a/apps/shared/function_list_controller.cpp
+++ b/apps/shared/function_list_controller.cpp
@@ -218,7 +218,7 @@ void FunctionListController::tableViewDidChangeSelection(SelectableTableView * t
   // Update memoization of cell heights
   ExpressionModelListController::tableViewDidChangeSelection(t, previousSelectedCellX, previousSelectedCellY, withinTemporarySelection);
   // Do not select the cell left of the "addEmptyFunction" cell
-  if (!withinTemporarySelection && isAddEmptyRow(selectedRow()) && selectedColumn() == 0) {
+  if (isAddEmptyRow(selectedRow()) && selectedColumn() == 0) {
     t->selectCellAtLocation(1, numberOfRows()-1);
   }
 }