diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc
index 378cc52bbb..2edc89d857 100644
--- a/tools/cabana/chartswidget.cc
+++ b/tools/cabana/chartswidget.cc
@@ -656,7 +656,16 @@ void ChartView::mouseMoveEvent(QMouseEvent *ev) {
   } else {
     QToolTip::hideText();
   }
+
   QChartView::mouseMoveEvent(ev);
+  if (is_zooming) {
+    QRect rubber_rect = rubber->geometry();
+    rubber_rect.setLeft(std::max(rubber_rect.left(), (int)plot_area.left()));
+    rubber_rect.setRight(std::min(rubber_rect.right(), (int)plot_area.right()));
+    if (rubber_rect != rubber->geometry()) {
+      rubber->setGeometry(rubber_rect);
+    }
+  }
 }
 
 void ChartView::dragMoveEvent(QDragMoveEvent *event) {