diff --git a/apps/shared/curve_view.cpp b/apps/shared/curve_view.cpp
index 56832003b..186003521 100644
--- a/apps/shared/curve_view.cpp
+++ b/apps/shared/curve_view.cpp
@@ -426,6 +426,10 @@ void CurveView::drawHorizontalOrVerticalSegment(KDContext * ctx, KDRect rect, Ax
     if (rect.intersects(lineRect)) {
       ctx->fillRect(lineRect, color);
     }
+    if (i > KDCOORDINATE_MAX - 2*dashSize) {
+      // Avoid overflowing KDCoordinate
+      break;
+    }
   }
 }