diff --git a/Terminal.Gui/Views/ColorPicker.cs b/Terminal.Gui/Views/ColorPicker.cs
index b9ca0dc23..71308543b 100644
--- a/Terminal.Gui/Views/ColorPicker.cs
+++ b/Terminal.Gui/Views/ColorPicker.cs
@@ -268,6 +268,11 @@ namespace Terminal.Gui {
 			}
 
 			SetFocus ();
+			if (me.X < GetFramesThickness ().Left || me.Y < GetFramesThickness ().Top || me.X > Bounds.Width || me.Y > Bounds.Height) {
+				return true;
+			}
+			//var x = Math.Max (GetFramesThickness().Left, me.X);
+			//var y = Math.Max (GetFramesThickness ().Top, me.Y);
 			Cursor = new Point ((me.X - GetFramesThickness ().Left) / _boxWidth, (me.Y - GetFramesThickness ().Top) / _boxHeight);
 
 			return true;