diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp
index 70b3b91f1..8dd252be1 100644
--- a/apps/shared/values_controller.cpp
+++ b/apps/shared/values_controller.cpp
@@ -50,9 +50,10 @@ const char * ValuesController::title() {
 }
 
 void ValuesController::viewWillAppear() {
+  // Reset memoization before any call to willDisplayCellAtLocation
+  resetMemoization();
   EditableCellTableViewController::viewWillAppear();
   header()->setSelectedButton(-1);
-  resetMemoization();
 }
 
 void ValuesController::viewDidDisappear() {