diff --git a/src/Ursa/Controls/ImageViewer/ImageViewer.cs b/src/Ursa/Controls/ImageViewer/ImageViewer.cs
index 557f90a..dd4de17 100644
--- a/src/Ursa/Controls/ImageViewer/ImageViewer.cs
+++ b/src/Ursa/Controls/ImageViewer/ImageViewer.cs
@@ -193,11 +193,6 @@ public class ImageViewer: TemplatedControl
 
     private void OnMinScaleChanged(AvaloniaPropertyChangedEventArgs args)
     {
-        var newMinScale = args.GetNewValue<double>();
-        if (newMinScale > Scale)
-        {
-            Scale = newMinScale;
-        }
         if (_image is { })
         {
             _sourceMinScale = Math.Min(Width * MinScale / _image.Width, Height * MinScale / _image.Height);
@@ -206,6 +201,11 @@ public class ImageViewer: TemplatedControl
         {
             _sourceMinScale = MinScale;
         }
+
+        if (_sourceMinScale > Scale)
+        {
+            Scale = _sourceMinScale;
+        }
     }
 
     private double GetScaleRatio(double widthRatio, double heightRatio, Stretch stretch)