diff --git a/apps/graph/values/interval_parameter_selector_controller.cpp b/apps/graph/values/interval_parameter_selector_controller.cpp
index 6a73674b9..b67d0c5ab 100644
--- a/apps/graph/values/interval_parameter_selector_controller.cpp
+++ b/apps/graph/values/interval_parameter_selector_controller.cpp
@@ -27,7 +27,8 @@ bool IntervalParameterSelectorController::handleEvent(Ion::Events::Event event)
   if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) {
     StackViewController * stack = (StackViewController *)parentResponder();
     Shared::IntervalParameterController * controller = App::app()->valuesController()->intervalParameterController();
-    controller->setTitle(messageAtIndex(selectedRow()));
+    Shared::CartesianFunction::PlotType plotType = plotTypeAtRow(selectedRow());
+    controller->setTitle(messageForType(plotType));
     controller->setInterval(App::app()->interval());
     stack->push(controller);
     return true;
@@ -49,16 +50,23 @@ int IntervalParameterSelectorController::reusableCellCount() {
 }
 
 void IntervalParameterSelectorController::willDisplayCellForIndex(HighlightCell * cell, int index) {
-  assert(0 <= index && index < MaxNumberOfRows);
-  static_cast<MessageTableCellWithChevron *>(cell)->setMessage(messageAtIndex(index));
+  assert(0 <= index && index < numberOfRows());
+  Shared::CartesianFunction::PlotType plotType = plotTypeAtRow(index);
+  static_cast<MessageTableCellWithChevron *>(cell)->setMessage(messageForType(plotType));
 }
 
-I18n::Message IntervalParameterSelectorController::messageAtIndex(int index) {
-  assert(0 <= index && index < MaxNumberOfRows);
-  constexpr I18n::Message message[MaxNumberOfRows] = {
-    I18n::Message::IntervalX
+Shared::CartesianFunction::PlotType IntervalParameterSelectorController::plotTypeAtRow(int j) const {
+  assert(0 <= j && j < numberOfRows());
+  return static_cast<Shared::CartesianFunction::PlotType>(j);
+}
+
+I18n::Message IntervalParameterSelectorController::messageForType(Shared::CartesianFunction::PlotType plotType) {
+  constexpr I18n::Message message[Shared::CartesianFunction::k_numberOfPlotTypes] = {
+    I18n::Message::IntervalX,
+    I18n::Message::IntervalTheta,
+    I18n::Message::IntervalT
   };
-  return message[index];
+  return message[static_cast<size_t>(plotType)];
 }
 
 }
diff --git a/apps/graph/values/interval_parameter_selector_controller.h b/apps/graph/values/interval_parameter_selector_controller.h
index 7627374de..e52f94ad5 100644
--- a/apps/graph/values/interval_parameter_selector_controller.h
+++ b/apps/graph/values/interval_parameter_selector_controller.h
@@ -2,6 +2,7 @@
 #define GRAPH_INTERVAL_PARAMETER_SELECTOR_CONTROLLER
 
 #include <escher.h>
+#include "../../shared/cartesian_function.h"
 
 namespace Graph {
 
@@ -18,8 +19,9 @@ public:
   HighlightCell * reusableCell(int index) override;
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
 private:
-  static constexpr int MaxNumberOfRows = 1;
-  I18n::Message messageAtIndex(int index);
+  static constexpr int MaxNumberOfRows = Shared::CartesianFunction::k_numberOfPlotTypes;
+  Shared::CartesianFunction::PlotType plotTypeAtRow(int j) const;
+  I18n::Message messageForType(Shared::CartesianFunction::PlotType plotType);
   MessageTableCellWithChevron m_intervalParameterCell[MaxNumberOfRows];
   SelectableTableView m_selectableTableView;
 };