diff --git a/src/Ursa/Controls/RangeSlider/RangeSlider.cs b/src/Ursa/Controls/RangeSlider/RangeSlider.cs
index 92f8298..f567d0f 100644
--- a/src/Ursa/Controls/RangeSlider/RangeSlider.cs
+++ b/src/Ursa/Controls/RangeSlider/RangeSlider.cs
@@ -212,7 +212,7 @@ public class RangeSlider: TemplatedControl
     {
         if (_track is null) return;
         var value = GetValueByPoint(posOnTrack);
-        var thumb = GetThumbByPoint(posOnTrack);
+        var thumb = _isDragging ? _currentThumb : GetThumbByPoint(posOnTrack);
         if (_currentThumb !=null && _currentThumb != thumb) return;
         if (thumb is null) return;
         if (thumb == _track.LowerThumb)
@@ -221,6 +221,7 @@ public class RangeSlider: TemplatedControl
         }
         else
         {
+            if (LowerValue >= value) SetCurrentValue(LowerValueProperty, IsSnapToTick ? SnapToTick(value) : value);
             SetCurrentValue(UpperValueProperty, IsSnapToTick ? SnapToTick(value) : value);
         }
     }