diff --git a/apps/shared/curve_view_cursor.cpp b/apps/shared/curve_view_cursor.cpp
index 883636ce8..ba665f416 100644
--- a/apps/shared/curve_view_cursor.cpp
+++ b/apps/shared/curve_view_cursor.cpp
@@ -23,8 +23,8 @@ void CurveViewCursor::moveTo(float x, float y) {
 }
 
 float CurveViewCursor::clipped(float x) {
-  float clippedX = x > k_maxFloat ? k_maxFloat : x;
-  clippedX = clippedX < - k_maxFloat ? -k_maxFloat : clippedX;
+  float clippedX = x > k_maxFloat ? INFINITY : x;
+  clippedX = clippedX < - k_maxFloat ? -INFINITY : clippedX;
   return clippedX;
 }
 
diff --git a/apps/shared/function_graph_controller.cpp b/apps/shared/function_graph_controller.cpp
index 5754ba48f..549315093 100644
--- a/apps/shared/function_graph_controller.cpp
+++ b/apps/shared/function_graph_controller.cpp
@@ -65,6 +65,9 @@ bool FunctionGraphController::didChangeRange(InteractiveCurveViewRange * interac
     }
   }
   float range = max - min;
+  if (max < min) {
+    range = 0.0f;
+  }
   if (interactiveCurveViewRange->yMin() == min-k_displayBottomMarginRatio*range
       && interactiveCurveViewRange->yMax() == max+k_displayTopMarginRatio*range) {
     return false;