diff --git a/app/widget/colorwheel/colorgradientwidget.cpp b/app/widget/colorwheel/colorgradientwidget.cpp
index ec87da5ec..82883eb69 100644
--- a/app/widget/colorwheel/colorgradientwidget.cpp
+++ b/app/widget/colorwheel/colorgradientwidget.cpp
@@ -76,10 +76,12 @@ void ColorGradientWidget::paintEvent(QPaintEvent *e)
   p.setPen(QPen(GetUISelectorColor(), qMax(1, selector_radius / 2)));
   p.setBrush(Qt::NoBrush);
 
+  float clamped_val = clamp(val_, 0.0f, 1.0f);
+
   if (orientation_ == Qt::Horizontal) {
-    p.drawRect(qRound(width() * (1.0 - val_)) - selector_radius, 0, selector_radius * 2, height() - 1);
+    p.drawRect(qRound(width() * (1.0 - clamped_val)) - selector_radius, 0, selector_radius * 2, height() - 1);
   } else {
-    p.drawRect(0, qRound(height() * (1.0 - val_)) - selector_radius, width() - 1, selector_radius * 2);
+    p.drawRect(0, qRound(height() * (1.0 - clamped_val)) - selector_radius, width() - 1, selector_radius * 2);
   }
 }
 
diff --git a/app/widget/colorwheel/colorwheelwidget.cpp b/app/widget/colorwheel/colorwheelwidget.cpp
index 3d9872146..4edf774f3 100644
--- a/app/widget/colorwheel/colorwheelwidget.cpp
+++ b/app/widget/colorwheel/colorwheelwidget.cpp
@@ -23,6 +23,7 @@
 #include <QPainter>
 #include <QtMath>
 
+#include "common/clamp.h"
 #include "node/node.h"
 
 OLIVE_NAMESPACE_ENTER
@@ -120,7 +121,7 @@ void ColorWheelWidget::SelectedColorChangedEvent(const Color &c, bool external)
 {
   if (external) {
     force_redraw_ = true;
-    val_ = c.value();
+    val_ = clamp(c.value(), 0.0f, 1.0f);
   }
 }