diff --git a/src/controls/QskBoundedRangeInput.cpp b/src/controls/QskBoundedRangeInput.cpp
index caf79ba9..882dd2f1 100644
--- a/src/controls/QskBoundedRangeInput.cpp
+++ b/src/controls/QskBoundedRangeInput.cpp
@@ -48,10 +48,12 @@ qreal QskBoundedRangeInput::upperValueAsRatio() const
 void QskBoundedRangeInput::setLowerValue( qreal value )
 {
     if ( isComponentComplete() )
+    {
+        value = std::min( value, m_range.upperBound() );
         value = qBound( minimum(), value, maximum() );
+    }
 
-    const auto upperValue = std::max( m_range.upperBound(), value );
-    setRange( QskIntervalF( value, upperValue ) );
+    setRange( QskIntervalF( value, m_range.upperBound() ) );
 }
 
 qreal QskBoundedRangeInput::lowerValue() const
@@ -62,10 +64,12 @@ qreal QskBoundedRangeInput::lowerValue() const
 void QskBoundedRangeInput::setUpperValue( qreal value )
 {
     if ( isComponentComplete() )
+    {
+        value = std::max( m_range.lowerBound(), value );
         value = qBound( minimum(), value, maximum() );
+    }
 
-    const auto lowerValue = std::min( m_range.lowerBound(), value );
-    setRange( QskIntervalF( lowerValue, value ) );
+    setRange( QskIntervalF( m_range.lowerBound(), value ) );
 }   
 
 qreal QskBoundedRangeInput::upperValue() const