diff --git a/Azaion.Common/Controls/NumericUpDown.xaml b/Azaion.Common/Controls/NumericUpDown.xaml
index 57fa233..d6c4f39 100644
--- a/Azaion.Common/Controls/NumericUpDown.xaml
+++ b/Azaion.Common/Controls/NumericUpDown.xaml
@@ -23,8 +23,10 @@
                  TextAlignment="Right"
                  VerticalAlignment="Center"
                  VerticalContentAlignment="Center"
-                 Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type local:NumericUpDown}}}"
+                 Text="{Binding Value, Mode=TwoWay, RelativeSource={RelativeSource AncestorType={x:Type local:NumericUpDown}}}"
                  LostFocus="NudTextBox_OnLostFocus"
+                 PreviewTextInput="NudTextBox_OnPreviewTextInput"
+                 DataObject.Pasting="NudTextBox_OnPasting"
                  />
         <RepeatButton
             Name="NudButtonUp"
diff --git a/Azaion.Common/Controls/NumericUpDown.xaml.cs b/Azaion.Common/Controls/NumericUpDown.xaml.cs
index 96404a7..64d0135 100644
--- a/Azaion.Common/Controls/NumericUpDown.xaml.cs
+++ b/Azaion.Common/Controls/NumericUpDown.xaml.cs
@@ -1,6 +1,8 @@
 using System.Globalization;
+using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 
 namespace Azaion.Common.Controls;
 
@@ -98,4 +100,27 @@ public partial class NumericUpDown : UserControl
 
         NudTextBox.SelectionStart = NudTextBox.Text.Length;
     }
+
+    private void NudTextBox_OnPreviewTextInput(object sender, TextCompositionEventArgs e)
+    {
+        var regex = new Regex("[^0-9.]+");
+        e.Handled = regex.IsMatch(e.Text);
+    }
+
+    private void NudTextBox_OnPasting(object sender, DataObjectPastingEventArgs e)
+    {
+        if (e.DataObject.GetDataPresent(typeof(string)))
+        {
+            var text = (string)e.DataObject.GetData(typeof(string));
+            var regex = new Regex("[^0-9.]+");
+            if (regex.IsMatch(text))
+            {
+                e.CancelCommand();
+            }
+        }
+        else
+        {
+            e.CancelCommand();
+        }
+    }
 }
\ No newline at end of file