diff --git a/Azaion.Common/Controls/NumericUpDown.xaml b/Azaion.Common/Controls/NumericUpDown.xaml
index 62bd90a..57fa233 100644
--- a/Azaion.Common/Controls/NumericUpDown.xaml
+++ b/Azaion.Common/Controls/NumericUpDown.xaml
@@ -24,7 +24,8 @@
                  VerticalAlignment="Center"
                  VerticalContentAlignment="Center"
                  Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type local:NumericUpDown}}}"
-                 TextChanged="NUDTextBox_OnTextChanged"/>
+                 LostFocus="NudTextBox_OnLostFocus"
+                 />
         <RepeatButton
             Name="NudButtonUp"
             Grid.Column="1"
diff --git a/Azaion.Common/Controls/NumericUpDown.xaml.cs b/Azaion.Common/Controls/NumericUpDown.xaml.cs
index f0dd6b2..a59ca0b 100644
--- a/Azaion.Common/Controls/NumericUpDown.xaml.cs
+++ b/Azaion.Common/Controls/NumericUpDown.xaml.cs
@@ -56,7 +56,25 @@ public partial class NumericUpDown : UserControl
         }
     }
 
-    private void NUDTextBox_OnTextChanged(object sender, TextChangedEventArgs e)
+    private void NudButtonUp_OnClick(object sender, RoutedEventArgs e)
+    {
+        var step = Step <= 0 ? 1m : Step;
+        var newVal = Math.Min(MaxValue, Value + step);
+        Value = newVal;
+        NudTextBox.Text = Value.ToString(CultureInfo.InvariantCulture);
+        NudTextBox.SelectionStart = NudTextBox.Text.Length;
+    }
+
+    private void NudButtonDown_OnClick(object sender, RoutedEventArgs e)
+    {
+        var step = Step <= 0 ? 1m : Step;
+        var newVal = Math.Max(MinValue, Value - step);
+        Value = newVal;
+        NudTextBox.Text = Value.ToString(CultureInfo.InvariantCulture);
+        NudTextBox.SelectionStart = NudTextBox.Text.Length;
+    }
+
+    private void NudTextBox_OnLostFocus(object sender, RoutedEventArgs e)
     {
         if (string.IsNullOrEmpty(NudTextBox.Text) || !decimal.TryParse(NudTextBox.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out var number))
         {
@@ -80,22 +98,4 @@ public partial class NumericUpDown : UserControl
 
         NudTextBox.SelectionStart = NudTextBox.Text.Length;
     }
-
-    private void NudButtonUp_OnClick(object sender, RoutedEventArgs e)
-    {
-        var step = Step <= 0 ? 1m : Step;
-        var newVal = Math.Min(MaxValue, Value + step);
-        Value = newVal;
-        NudTextBox.Text = Value.ToString(CultureInfo.InvariantCulture);
-        NudTextBox.SelectionStart = NudTextBox.Text.Length;
-    }
-
-    private void NudButtonDown_OnClick(object sender, RoutedEventArgs e)
-    {
-        var step = Step <= 0 ? 1m : Step;
-        var newVal = Math.Max(MinValue, Value - step);
-        Value = newVal;
-        NudTextBox.Text = Value.ToString(CultureInfo.InvariantCulture);
-        NudTextBox.SelectionStart = NudTextBox.Text.Length;
-    }
 }
\ No newline at end of file
diff --git a/Azaion.Dataset/DatasetExplorer.xaml.cs b/Azaion.Dataset/DatasetExplorer.xaml.cs
index bf6aabb..ed25664 100644
--- a/Azaion.Dataset/DatasetExplorer.xaml.cs
+++ b/Azaion.Dataset/DatasetExplorer.xaml.cs
@@ -195,11 +195,12 @@ public partial class DatasetExplorer
             ThumbnailsView.SelectedIndex = index;
 
             var ann = CurrentAnnotation.Annotation;
-            ExplorerEditor.SetBackground(await ann.ImagePath.OpenImage());
+            var image = await ann.ImagePath.OpenImage();
+            ExplorerEditor.SetBackground(image);
             SwitchTab(toEditor: true);
 
             ExplorerEditor.RemoveAllAnns();
-            ExplorerEditor.CreateDetections(ann, _appConfig.AnnotationConfig.DetectionClasses, ExplorerEditor.RenderSize);
+            ExplorerEditor.CreateDetections(ann, _appConfig.AnnotationConfig.DetectionClasses, new Size(image.PixelWidth, image.PixelHeight));
         }
         catch (Exception e)
         {