diff --git a/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs b/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs
index 5984e5432..18c18894c 100644
--- a/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs
+++ b/src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs
@@ -144,7 +144,7 @@ namespace Artemis.Core
         {
             // Don't update data bindings if there is no delta, otherwise this creates an inconsistency between
             // data bindings with easing and data bindings without easing (the ones with easing will seemingly not update)
-            if (timeline.Delta == TimeSpan.Zero)
+            if (timeline.Delta == TimeSpan.Zero || timeline.IsOverridden)
                 return;
 
             UpdateWithDelta(timeline.Delta);
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingView.xaml
index 770262e39..327b7ede9 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingView.xaml
@@ -99,7 +99,7 @@
                                    Grid.Column="1"
                                    Margin="0 10 10 0"
                                    Visibility="{Binding AlwaysApplyDataBindings.Value, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}}"
-                                   ToolTip="Click Play to ensure all other data bindings update as well or enable 'Constantly apply data bindings in editor'"
+                                   ToolTip="Check 'Apply data bindings in editor'"
                                    Cursor="Help">
                             Other data bindings not updating?
                         </TextBlock>
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileView.xaml
index aea990eaf..a9314aa0b 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileView.xaml
@@ -137,8 +137,8 @@
                         <CheckBox Style="{StaticResource MaterialDesignCheckBox}" 
                                   Margin="10 0 0 0" 
                                   IsChecked="{Binding AlwaysApplyDataBindings.Value}"
-                                  ToolTip="If selected, constantly updates all data bindings instead of only when playing">
-                            Constantly apply data bindings in editor
+                                  ToolTip="If selected, updates all data bindings instead of only the one you are editing">
+                            Apply all data bindings in editor
                         </CheckBox>
                     </StackPanel>
                 </materialDesign:Card>