diff --git a/apps/alternate_empty_nested_menu_controller.cpp b/apps/alternate_empty_nested_menu_controller.cpp
index b09acca75..d3a89f0f9 100644
--- a/apps/alternate_empty_nested_menu_controller.cpp
+++ b/apps/alternate_empty_nested_menu_controller.cpp
@@ -7,7 +7,7 @@ void AlternateEmptyNestedMenuController::viewDidDisappear() {
   NestedMenuController::viewDidDisappear();
 }
 
-bool AlternateEmptyNestedMenuController::displayEmptyController() {
+bool AlternateEmptyNestedMenuController::displayEmptyControllerIfNeeded() {
   assert(!isDisplayingEmptyController());
   // If the content is empty, we push an empty controller.
   if (numberOfRows() == 0) {
diff --git a/apps/alternate_empty_nested_menu_controller.h b/apps/alternate_empty_nested_menu_controller.h
index 0427a2bf8..3397cf66d 100644
--- a/apps/alternate_empty_nested_menu_controller.h
+++ b/apps/alternate_empty_nested_menu_controller.h
@@ -13,7 +13,7 @@ public:
 protected:
   virtual ViewController * emptyViewController() = 0;
   virtual bool isDisplayingEmptyController() = 0;
-  bool displayEmptyController();
+  bool displayEmptyControllerIfNeeded();
 };
 
 #endif
diff --git a/apps/code/variable_box_controller.cpp b/apps/code/variable_box_controller.cpp
index ec31fbae1..ff296d6a7 100644
--- a/apps/code/variable_box_controller.cpp
+++ b/apps/code/variable_box_controller.cpp
@@ -62,7 +62,7 @@ void VariableBoxController::didEnterResponderChain(Responder * previousFirstResp
    * when leaving the VariableBoxController, so we do not lose the environment
    * that was loaded when entering the VariableBoxController. */
   assert(App::app()->pythonIsInited());
-  displayEmptyController();
+  displayEmptyControllerIfNeeded();
 }
 
 KDCoordinate VariableBoxController::rowHeight(int j) {
diff --git a/apps/math_variable_box_controller.cpp b/apps/math_variable_box_controller.cpp
index 7eb72b39e..1d6c968ce 100644
--- a/apps/math_variable_box_controller.cpp
+++ b/apps/math_variable_box_controller.cpp
@@ -62,7 +62,7 @@ bool MathVariableBoxController::handleEvent(Ion::Events::Event event) {
     int newSelectedRow = rowIndex >= numberOfRows() ? numberOfRows()-1 : rowIndex;
     selectCellAtLocation(selectedColumn(), newSelectedRow);
     m_selectableTableView.reloadData();
-    displayEmptyController();
+    displayEmptyControllerIfNeeded();
     return true;
   }
   return AlternateEmptyNestedMenuController::handleEvent(event);
@@ -160,7 +160,7 @@ bool MathVariableBoxController::selectSubMenu(int selectedRow) {
   m_selectableTableView.deselectTable();
   setPage(pageAtIndex(selectedRow));
   bool selectSubMenu = AlternateEmptyNestedMenuController::selectSubMenu(selectedRow);
-  if (displayEmptyController()) {
+  if (displayEmptyControllerIfNeeded()) {
     return true;
   }
   return selectSubMenu;