diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBox.cs b/src/Wpf.Ui/Controls/NumberBox/NumberBox.cs index dec94b261..89b7048f0 100644 --- a/src/Wpf.Ui/Controls/NumberBox/NumberBox.cs +++ b/src/Wpf.Ui/Controls/NumberBox/NumberBox.cs @@ -421,7 +421,11 @@ private void StepValue(double? change) newValue += change ?? 0d; } - SetCurrentValue(ValueProperty, newValue); + // After adding step value, validate new value is between Minimum and Maximum + if (newValue >= Minimum && newValue <= Maximum) + { + SetCurrentValue(ValueProperty, newValue); + } MoveCaretToTextEnd(); }