diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp
index a9b48a753..e95c2dc2e 100644
--- a/apps/graph/values/values_controller.cpp
+++ b/apps/graph/values/values_controller.cpp
@@ -188,7 +188,7 @@ ValueCell * ValuesController::abscisseCellAtRow(int rowIndex) {
 }
 
 void ValuesController::didBecomeFirstResponder() {
-  if (m_functionStore->numberOfActiveFunctions() == 0) {
+  if (m_functionStore->numberOfDefinedFunctions() == 0 || m_functionStore->numberOfActiveFunctions() == 0) {
     m_contentView.setTableState(ValuesController::ContentView::TableState::Empty);
     return;
   }