diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp
index c668f0023..0aec8826a 100644
--- a/apps/shared/values_controller.cpp
+++ b/apps/shared/values_controller.cpp
@@ -100,23 +100,17 @@ bool ValuesController::handleEvent(Ion::Events::Event event) {
     selectableTableView()->reloadData();
     return true;
   }
-  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
-    if (selectedRow() == -1) {
-      return header()->handleEvent(event);
-    }
-    if (selectedRow() == 0) {
-      if (selectedColumn() == 0) {
-        configureAbscissa();
-        return true;
-      }
-      configureFunction();
-      return true;
-    }
-    return false;
-  }
   if (selectedRow() == -1) {
     return header()->handleEvent(event);
   }
+  if ((event == Ion::Events::OK || event == Ion::Events::EXE) && selectedRow() == 0) {
+    if (selectedColumn() == 0) {
+      configureAbscissa();
+      return true;
+    }
+    configureFunction();
+    return true;
+  }
   return false;
 }