diff --git a/apps/regression/go_to_parameter_controller.cpp b/apps/regression/go_to_parameter_controller.cpp
index 36956f7be..1b004f1e3 100644
--- a/apps/regression/go_to_parameter_controller.cpp
+++ b/apps/regression/go_to_parameter_controller.cpp
@@ -65,6 +65,8 @@ bool GoToParameterController::setParameterAtIndex(int parameterIndex, float f) {
   } else {
     m_cursor->moveTo(x, f);
   }
+  m_graphRange->centerAxisAround(CurveViewRange::Axis::X, m_cursor->x());
+  m_graphRange->centerAxisAround(CurveViewRange::Axis::Y, m_cursor->y());
   return true;
 }
 
diff --git a/apps/shared/function_go_to_parameter_controller.cpp b/apps/shared/function_go_to_parameter_controller.cpp
index 9420c62e5..89aeb8866 100644
--- a/apps/shared/function_go_to_parameter_controller.cpp
+++ b/apps/shared/function_go_to_parameter_controller.cpp
@@ -32,6 +32,8 @@ bool FunctionGoToParameterController::setParameterAtIndex(int parameterIndex, fl
     return false;
   }
   m_cursor->moveTo(f, y);
+  m_graphRange->centerAxisAround(CurveViewRange::Axis::X, m_cursor->x());
+  m_graphRange->centerAxisAround(CurveViewRange::Axis::Y, m_cursor->y());
   return true;
 }
 
diff --git a/apps/shared/go_to_parameter_controller.cpp b/apps/shared/go_to_parameter_controller.cpp
index f72235ab4..f26d1e89b 100644
--- a/apps/shared/go_to_parameter_controller.cpp
+++ b/apps/shared/go_to_parameter_controller.cpp
@@ -7,8 +7,8 @@ namespace Shared {
 GoToParameterController::GoToParameterController(Responder * parentResponder, InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor, I18n::Message symbol) :
   FloatParameterController(parentResponder),
   m_cursor(cursor),
-  m_abscisseCell(nullptr),
   m_graphRange(graphRange),
+  m_abscisseCell(nullptr),
   m_abscissaSymbol(symbol)
 {
 }
@@ -27,8 +27,6 @@ int GoToParameterController::reusableParameterCellCount(int type) {
 }
 
 void GoToParameterController::buttonAction() {
-  m_graphRange->centerAxisAround(CurveViewRange::Axis::X, m_cursor->x());
-  m_graphRange->centerAxisAround(CurveViewRange::Axis::Y, m_cursor->y());
   StackViewController * stack = (StackViewController *)parentResponder();
   stack->pop();
   stack->pop();
diff --git a/apps/shared/go_to_parameter_controller.h b/apps/shared/go_to_parameter_controller.h
index 4285a117e..b63a689bc 100644
--- a/apps/shared/go_to_parameter_controller.h
+++ b/apps/shared/go_to_parameter_controller.h
@@ -15,6 +15,7 @@ public:
 protected:
   constexpr static float k_maxDisplayableFloat = 1E8f;
   CurveViewCursor * m_cursor;
+  InteractiveCurveViewRange * m_graphRange;
 private:
   void buttonAction() override;
   HighlightCell * reusableParameterCell(int index, int type) override;
@@ -23,7 +24,6 @@ private:
   void unloadView(View * view) override;
   char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength];
   MessageTableCellWithEditableText * m_abscisseCell;
-  InteractiveCurveViewRange * m_graphRange;
   I18n::Message m_abscissaSymbol;
 };