diff --git a/src/Artemis.UI/DefaultTypes/DataModel/Input/DoubleDataModelInputViewModel.cs b/src/Artemis.UI/DefaultTypes/DataModel/Input/DoubleDataModelInputViewModel.cs
index b939a7380..4fe8e02ef 100644
--- a/src/Artemis.UI/DefaultTypes/DataModel/Input/DoubleDataModelInputViewModel.cs
+++ b/src/Artemis.UI/DefaultTypes/DataModel/Input/DoubleDataModelInputViewModel.cs
@@ -14,9 +14,12 @@ namespace Artemis.UI.DefaultTypes.DataModel.Input
 
         public void NumberValidationTextBox(object sender, TextCompositionEventArgs e)
         {
-            string seperator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
-            Regex regex = new("^[" + seperator + "][0-9]+$|^[0-9]*[" + seperator + "]{0,1}[0-9]*$");
-            e.Handled = !regex.IsMatch(e.Text);
+            if (e.Text != "-")
+            {
+                string seperator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+                Regex regex = new("^[" + seperator + "][0-9]+$|^[0-9]*[" + seperator + "]{0,1}[0-9]*$");
+                e.Handled = !regex.IsMatch(e.Text);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingViewModel.cs
index 7adf0622e..0ba67c4ab 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingViewModel.cs
@@ -64,6 +64,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             {
                 if (!SetAndNotify(ref _selectedDataBindingMode, value)) return;
                 ApplyDataBindingMode();
+                Update();
             }
         }
 
@@ -145,6 +146,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 
             if (Registration.DataBinding == null)
             {
+                IsDataBindingEnabled = false;
                 IsEasingTimeEnabled = false;
                 return;
             }
@@ -199,7 +201,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 
             Registration.DataBinding.ChangeDataBindingMode(SelectedDataBindingMode);
             CreateDataBindingModeModeViewModel();
-
             _profileEditorService.UpdateSelectedProfileElement();
         }