diff --git a/apps/graph/graph/calculation_graph_controller.cpp b/apps/graph/graph/calculation_graph_controller.cpp
index 73c95a9e0..3580395a5 100644
--- a/apps/graph/graph/calculation_graph_controller.cpp
+++ b/apps/graph/graph/calculation_graph_controller.cpp
@@ -30,7 +30,7 @@ void CalculationGraphController::viewWillAppear() {
     m_isActive = true;
     assert(App::app()->functionStore()->modelForRecord(m_record)->plotType() == Shared::ContinuousFunction::PlotType::Cartesian);
     m_cursor->moveTo(pointOfInterest.x1(), pointOfInterest.x1(), pointOfInterest.x2());
-    m_graphRange->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio, curveView()->pixelWidth());
+    m_graphRange->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), cursorRightMarginRatio(), cursorBottomMarginRatio(), cursorLeftMarginRatio(), curveView()->pixelWidth());
     m_bannerView->setNumberOfSubviews(Shared::XYBannerView::k_numberOfSubviews);
     reloadBannerView();
   }
diff --git a/apps/graph/graph/extremum_graph_controller.h b/apps/graph/graph/extremum_graph_controller.h
index dc93bfc96..cadfbeb68 100644
--- a/apps/graph/graph/extremum_graph_controller.h
+++ b/apps/graph/graph/extremum_graph_controller.h
@@ -12,6 +12,9 @@ public:
   TELEMETRY_ID("Minimum");
 private:
   Poincare::Coordinate2D<double> computeNewPointOfInterest(double start, double step, double max, Poincare::Context * context) override;
+  // Prevent horizontal panning to preserve search interval
+  float cursorRightMarginRatio() override { return 0.0f; }
+  float cursorLeftMarginRatio() override { return 0.0f; }
 };
 
 class MaximumGraphController : public CalculationGraphController {
@@ -21,6 +24,9 @@ public:
   TELEMETRY_ID("Maximum");
 private:
   Poincare::Coordinate2D<double> computeNewPointOfInterest(double start, double step, double max, Poincare::Context * context) override;
+  // Prevent horizontal panning to preserve search interval
+  float cursorRightMarginRatio() override { return 0.0f; }
+  float cursorLeftMarginRatio() override { return 0.0f; }
 };
 
 }
diff --git a/apps/graph/graph/intersection_graph_controller.h b/apps/graph/graph/intersection_graph_controller.h
index dfd69232c..46bce552a 100644
--- a/apps/graph/graph/intersection_graph_controller.h
+++ b/apps/graph/graph/intersection_graph_controller.h
@@ -13,6 +13,9 @@ private:
   void reloadBannerView() override;
   Poincare::Coordinate2D<double> computeNewPointOfInterest(double start, double step, double max, Poincare::Context * context) override;
   Ion::Storage::Record m_intersectedRecord;
+  // Prevent horizontal panning to preserve search interval
+  float cursorRightMarginRatio() override { return 0.0f; }
+  float cursorLeftMarginRatio() override { return 0.0f; }
 };
 
 }
diff --git a/apps/graph/graph/root_graph_controller.h b/apps/graph/graph/root_graph_controller.h
index 6bb7264a2..b808cb920 100644
--- a/apps/graph/graph/root_graph_controller.h
+++ b/apps/graph/graph/root_graph_controller.h
@@ -12,6 +12,9 @@ public:
   TELEMETRY_ID("Root");
 private:
   Poincare::Coordinate2D<double> computeNewPointOfInterest(double start, double step, double max, Poincare::Context * context) override;
+  // Prevent horizontal panning to preserve search interval
+  float cursorRightMarginRatio() override { return 0.0f; }
+  float cursorLeftMarginRatio() override { return 0.0f; }
 };
 
 }
diff --git a/apps/graph/graph/tangent_graph_controller.cpp b/apps/graph/graph/tangent_graph_controller.cpp
index 5edf674d8..af70b1b42 100644
--- a/apps/graph/graph/tangent_graph_controller.cpp
+++ b/apps/graph/graph/tangent_graph_controller.cpp
@@ -24,7 +24,7 @@ const char * TangentGraphController::title() {
 
 void TangentGraphController::viewWillAppear() {
   Shared::SimpleInteractiveCurveViewController::viewWillAppear();
-  m_graphRange->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio, curveView()->pixelWidth());
+  m_graphRange->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), cursorRightMarginRatio(), cursorBottomMarginRatio(), cursorLeftMarginRatio(), curveView()->pixelWidth());
   m_graphView->drawTangent(true);
   m_graphView->setOkView(nullptr);
   m_graphView->selectMainView(true);
@@ -51,7 +51,7 @@ bool TangentGraphController::textFieldDidFinishEditing(TextField * textField, co
   assert(function->plotType() == Shared::ContinuousFunction::PlotType::Cartesian);
   double y = function->evaluate2DAtParameter(floatBody, myApp->localContext()).x2();
   m_cursor->moveTo(floatBody, floatBody, y);
-  interactiveCurveViewRange()->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio, curveView()->pixelWidth());
+  interactiveCurveViewRange()->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), cursorRightMarginRatio(), cursorBottomMarginRatio(), cursorLeftMarginRatio(), curveView()->pixelWidth());
   reloadBannerView();
   curveView()->reload();
   return true;
diff --git a/apps/regression/graph_controller.cpp b/apps/regression/graph_controller.cpp
index dec921c63..919bd0396 100644
--- a/apps/regression/graph_controller.cpp
+++ b/apps/regression/graph_controller.cpp
@@ -262,7 +262,7 @@ void GraphController::initCursorParameters() {
   double y = m_store->meanOfColumn(*m_selectedSeriesIndex, 1);
   m_cursor->moveTo(x, x, y);
   if (m_store->yAuto()) {
-    m_store->panToMakePointVisible(x, y, cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio, curveView()->pixelWidth());
+    m_store->panToMakePointVisible(x, y, cursorTopMarginRatio(), cursorRightMarginRatio(), cursorBottomMarginRatio(), cursorLeftMarginRatio(), curveView()->pixelWidth());
   }
   *m_selectedDotIndex = m_store->numberOfPairsOfSeries(*m_selectedSeriesIndex);
 }
diff --git a/apps/sequence/graph/graph_controller.cpp b/apps/sequence/graph/graph_controller.cpp
index a0552361e..e2e4fe52f 100644
--- a/apps/sequence/graph/graph_controller.cpp
+++ b/apps/sequence/graph/graph_controller.cpp
@@ -67,7 +67,7 @@ bool GraphController::textFieldDidFinishEditing(TextField * textField, const cha
   floatBody = std::fmax(0, std::round(floatBody));
   double y = xyValues(selectedCurveIndex(), floatBody, myApp->localContext()).x2();
   m_cursor->moveTo(floatBody, floatBody, y);
-  interactiveCurveViewRange()->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio, curveView()->pixelWidth());
+  interactiveCurveViewRange()->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), cursorRightMarginRatio(), cursorBottomMarginRatio(), cursorLeftMarginRatio(), curveView()->pixelWidth());
   reloadBannerView();
   m_view.reload();
   return true;
diff --git a/apps/shared/function_graph_controller.cpp b/apps/shared/function_graph_controller.cpp
index 04a08dec4..9f791969c 100644
--- a/apps/shared/function_graph_controller.cpp
+++ b/apps/shared/function_graph_controller.cpp
@@ -146,7 +146,7 @@ void FunctionGraphController::initCursorParameters() {
   }
   m_cursor->moveTo(t, xy.x1(), xy.x2());
   if (interactiveCurveViewRange()->yAuto()) {
-    interactiveCurveViewRange()->panToMakePointVisible(xy.x1(), xy.x2(), cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio, curveView()->pixelWidth());
+    interactiveCurveViewRange()->panToMakePointVisible(xy.x1(), xy.x2(), cursorTopMarginRatio(), cursorRightMarginRatio(), cursorBottomMarginRatio(), cursorLeftMarginRatio(), curveView()->pixelWidth());
   }
   selectFunctionWithCursor(functionIndex);
 }
diff --git a/apps/shared/interactive_curve_view_controller.cpp b/apps/shared/interactive_curve_view_controller.cpp
index 1d2f23bae..25aa9149d 100644
--- a/apps/shared/interactive_curve_view_controller.cpp
+++ b/apps/shared/interactive_curve_view_controller.cpp
@@ -54,8 +54,8 @@ float InteractiveCurveViewController::addMargin(float y, float range, bool isVer
    *   bottomMarginRatio = bottomMargin / viewHeight.
    * The same goes horizontally.
    */
-  float topMarginRatio = isVertical ? cursorTopMarginRatio() : k_cursorRightMarginRatio;
-  float bottomMarginRatio = isVertical ? cursorBottomMarginRatio() : k_cursorLeftMarginRatio;
+  float topMarginRatio = isVertical ? cursorTopMarginRatio() : cursorRightMarginRatio();
+  float bottomMarginRatio = isVertical ? cursorBottomMarginRatio() : cursorLeftMarginRatio();
   assert(topMarginRatio + bottomMarginRatio < 1); // Assertion so that the formula is correct
   float ratioDenominator = 1 - bottomMarginRatio - topMarginRatio;
   float ratio = isMin ? -bottomMarginRatio : topMarginRatio;
@@ -93,7 +93,7 @@ bool InteractiveCurveViewController::handleEvent(Ion::Events::Event event) {
     if (moveCursorVertically(direction)) {
       interactiveCurveViewRange()->panToMakePointVisible(
         m_cursor->x(), m_cursor->y(),
-        cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio,
+        cursorTopMarginRatio(), cursorRightMarginRatio(), cursorBottomMarginRatio(), cursorLeftMarginRatio(),
         curveView()->pixelWidth()
       );
       reloadBannerView();
@@ -221,7 +221,7 @@ bool InteractiveCurveViewController::textFieldDidFinishEditing(TextField * textF
   }
   Coordinate2D<double> xy = xyValues(selectedCurveIndex(), floatBody, textFieldDelegateApp()->localContext());
   m_cursor->moveTo(floatBody, xy.x1(), xy.x2());
-  interactiveCurveViewRange()->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio, curveView()->pixelWidth());
+  interactiveCurveViewRange()->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), cursorRightMarginRatio(), cursorBottomMarginRatio(), cursorLeftMarginRatio(), curveView()->pixelWidth());
   reloadBannerView();
   curveView()->reload();
   return true;
@@ -247,10 +247,10 @@ bool InteractiveCurveViewController::isCursorVisible() {
   float xRange = range->xMax() - range->xMin();
   float yRange = range->yMax() - range->yMin();
   return
-    m_cursor->x() >= range->xMin() +  k_cursorLeftMarginRatio   * xRange &&
-    m_cursor->x() <= range->xMax() - k_cursorRightMarginRatio   * xRange &&
-    m_cursor->y() >= range->yMin() +  cursorBottomMarginRatio() * yRange &&
-    m_cursor->y() <= range->yMax() -     cursorTopMarginRatio() * yRange;
+    m_cursor->x() >= range->xMin() +   cursorLeftMarginRatio() * xRange &&
+    m_cursor->x() <= range->xMax() -  cursorRightMarginRatio() * xRange &&
+    m_cursor->y() >= range->yMin() + cursorBottomMarginRatio() * yRange &&
+    m_cursor->y() <= range->yMax() -    cursorTopMarginRatio() * yRange;
 }
 
 int InteractiveCurveViewController::closestCurveIndexVertically(bool goingUp, int currentCurveIndex, Poincare::Context * context) const {
diff --git a/apps/shared/simple_interactive_curve_view_controller.cpp b/apps/shared/simple_interactive_curve_view_controller.cpp
index 10d079984..3169adb59 100644
--- a/apps/shared/simple_interactive_curve_view_controller.cpp
+++ b/apps/shared/simple_interactive_curve_view_controller.cpp
@@ -31,7 +31,7 @@ bool SimpleInteractiveCurveViewController::handleLeftRightEvent(Ion::Events::Eve
   if (moveCursorHorizontally(direction, Ion::Events::repetitionFactor())) {
     interactiveCurveViewRange()->panToMakePointVisible(
       m_cursor->x(), m_cursor->y(),
-      cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio,
+      cursorTopMarginRatio(), cursorRightMarginRatio(), cursorBottomMarginRatio(), cursorLeftMarginRatio(),
       curveView()->pixelWidth()
     );
     reloadBannerView();
diff --git a/apps/shared/simple_interactive_curve_view_controller.h b/apps/shared/simple_interactive_curve_view_controller.h
index 8bf2c7715..ab34fc3e4 100644
--- a/apps/shared/simple_interactive_curve_view_controller.h
+++ b/apps/shared/simple_interactive_curve_view_controller.h
@@ -15,8 +15,8 @@ public:
   bool handleEvent(Ion::Events::Event event) override;
   bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override;
 protected:
-  constexpr static float k_cursorRightMarginRatio = 0.04f; // (cursorWidth/2)/(graphViewWidth-1)
-  constexpr static float k_cursorLeftMarginRatio = 0.04f;  // (cursorWidth/2)/(graphViewWidth-1)
+  virtual float cursorRightMarginRatio() { return 0.04f; } // (cursorWidth/2)/(graphViewWidth-1)
+  virtual float cursorLeftMarginRatio() { return 0.04f; }  // (cursorWidth/2)/(graphViewWidth-1)
   virtual float cursorTopMarginRatio() { return 0.07f; }   // (cursorHeight/2)/(graphViewHeight-1)
   virtual float cursorBottomMarginRatio() = 0;             // (cursorHeight/2+bannerHeight)/(graphViewHeight-1)
   constexpr static float k_numberOfCursorStepsInGradUnit = 5.0f;
diff --git a/apps/shared/sum_graph_controller.cpp b/apps/shared/sum_graph_controller.cpp
index 02b42800a..423582e90 100644
--- a/apps/shared/sum_graph_controller.cpp
+++ b/apps/shared/sum_graph_controller.cpp
@@ -26,7 +26,7 @@ SumGraphController::SumGraphController(Responder * parentResponder, InputEventHa
 
 void SumGraphController::viewWillAppear() {
   SimpleInteractiveCurveViewController::viewWillAppear();
-  m_graphRange->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio, curveView()->pixelWidth());
+  m_graphRange->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), cursorRightMarginRatio(), cursorBottomMarginRatio(), cursorLeftMarginRatio(), curveView()->pixelWidth());
   m_graphView->setBannerView(&m_legendView);
   m_graphView->setCursorView(&m_cursorView);
   m_graphView->setOkView(nullptr);
@@ -77,7 +77,7 @@ bool SumGraphController::moveCursorHorizontallyToPosition(double x) {
     m_graphView->setAreaHighlight(m_startSum, m_cursor->x());
   }
   m_legendView.setEditableZone(m_cursor->x());
-  m_graphRange->panToMakePointVisible(x, y, cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio, curveView()->pixelWidth());
+  m_graphRange->panToMakePointVisible(x, y, cursorTopMarginRatio(), cursorRightMarginRatio(), cursorBottomMarginRatio(), cursorLeftMarginRatio(), curveView()->pixelWidth());
   m_graphView->reload();
   return true;
 }