diff --git a/apps/graph/list/list_parameter_controller.cpp b/apps/graph/list/list_parameter_controller.cpp
index 14d3b7205..8e63fdeda 100644
--- a/apps/graph/list/list_parameter_controller.cpp
+++ b/apps/graph/list/list_parameter_controller.cpp
@@ -23,6 +23,20 @@ HighlightCell * ListParameterController::reusableCell(int index, int type) {
   }
 }
 
+bool ListParameterController::handleEvent(Ion::Events::Event event) {
+  if (Shared::ListParameterController::handleEvent(event)) {
+    return true;
+  }
+  if (event == Ion::Events::Right) {
+    int selectedR = selectedRow();
+    if (selectedR == 0 || selectedR == 1) {
+      // Go in the submenu
+      return handleEnterOnRow(selectedR);
+    }
+  }
+  return false;
+}
+
 void ListParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) {
   Shared::ListParameterController::willDisplayCellForIndex(cell, index);
   if ((cell == &m_typeCell || cell == &m_functionDomain) && !m_record.isNull()) {
diff --git a/apps/graph/list/list_parameter_controller.h b/apps/graph/list/list_parameter_controller.h
index 474ec2902..41f222a54 100644
--- a/apps/graph/list/list_parameter_controller.h
+++ b/apps/graph/list/list_parameter_controller.h
@@ -19,6 +19,7 @@ public:
     m_domainParameterController(nullptr, inputEventHandlerDelegate),
     m_renameCell(I18n::Message::Rename)
   {}
+  bool handleEvent(Ion::Events::Event event) override;
   // ListViewDataSource
   HighlightCell * reusableCell(int index, int type) override;
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;