diff --git a/src/Artemis.Core/MVVM/CorePropertyChanged.cs b/src/Artemis.Core/MVVM/CorePropertyChanged.cs
index 69aeef147..bcd1e0e69 100644
--- a/src/Artemis.Core/MVVM/CorePropertyChanged.cs
+++ b/src/Artemis.Core/MVVM/CorePropertyChanged.cs
@@ -21,7 +21,7 @@ namespace Artemis.Core
         #region Methods
 
         /// <summary>
-        ///     Checks if the property already matches the desirec value or needs to be updated.
+        ///     Checks if the property already matches the desired value or needs to be updated.
         /// </summary>
         /// <typeparam name="T">Type of the property.</typeparam>
         /// <param name="storage">Reference to the backing-filed.</param>
diff --git a/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs b/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs
index 3df5ab087..6f83c0e8b 100644
--- a/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs
+++ b/src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs
@@ -24,12 +24,12 @@ public class DraggableNumberBox : UserControl
     /// <summary>
     ///     Defines the <see cref="Minimum" /> property.
     /// </summary>
-    public static readonly StyledProperty<double> MinimumProperty = AvaloniaProperty.Register<DraggableNumberBox, double>(nameof(Minimum), double.MinValue);
+    public static readonly StyledProperty<double> MinimumProperty = AvaloniaProperty.Register<DraggableNumberBox, double>(nameof(Minimum));
 
     /// <summary>
     ///     Defines the <see cref="Maximum" /> property.
     /// </summary>
-    public static readonly StyledProperty<double> MaximumProperty = AvaloniaProperty.Register<DraggableNumberBox, double>(nameof(Maximum), double.MaxValue);
+    public static readonly StyledProperty<double> MaximumProperty = AvaloniaProperty.Register<DraggableNumberBox, double>(nameof(Maximum));
 
     /// <summary>
     ///     Defines the <see cref="LargeChange" /> property.
diff --git a/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputViewModel.cs b/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputViewModel.cs
index c7f62eed5..f59d9de87 100644
--- a/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputViewModel.cs
+++ b/src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputViewModel.cs
@@ -95,6 +95,9 @@ public abstract class PropertyInputViewModel<T> : PropertyInputViewModel
         get => _inputValue;
         set
         {
+            if (Equals(_inputValue, value))
+                return;
+            
             this.RaiseAndSetIfChanged(ref _inputValue, value);
             ApplyInputValue();
         }