diff --git a/Source/Editor/GUI/Timeline/Track.cs b/Source/Editor/GUI/Timeline/Track.cs
index 6ba8191d6..297371159 100644
--- a/Source/Editor/GUI/Timeline/Track.cs
+++ b/Source/Editor/GUI/Timeline/Track.cs
@@ -896,13 +896,12 @@ namespace FlaxEditor.GUI.Timeline
             var left = _xOffset + 16; // offset + arrow
             var height = HeaderHeight;
             var bounds = new Rectangle(Vector2.Zero, Size);
-            var textRect = new Rectangle(left, 0, Width - left, height);
+            var textRect = new Rectangle(left, 0, bounds.Width - left, height);
             _margin.ShrinkRectangle(ref textRect);
             var textColor = style.Foreground * TitleTintColor;
             var backgroundColorSelected = style.BackgroundSelected;
             var backgroundColorHighlighted = style.BackgroundHighlighted;
             var backgroundColorSelectedUnfocused = style.LightBackground;
-            var textFont = new FontReference(style.FontSmall);
             var isMouseOver = IsMouseOver;
 
             // Draw background
@@ -926,7 +925,7 @@ namespace FlaxEditor.GUI.Timeline
             }
 
             // Draw text
-            Render2D.DrawText(textFont.GetFont(), Title ?? Name, textRect, textColor, TextAlignment.Near, TextAlignment.Center);
+            Render2D.DrawText(style.FontSmall, Title ?? Name, textRect, textColor, TextAlignment.Near, TextAlignment.Center);
 
             // Disabled overlay
             DrawDisabled = Mute || (ParentTrack != null && ParentTrack.DrawDisabled);
diff --git a/Source/Editor/GUI/Timeline/Tracks/CurvePropertyTrack.cs b/Source/Editor/GUI/Timeline/Tracks/CurvePropertyTrack.cs
index 6280384aa..8e01d2706 100644
--- a/Source/Editor/GUI/Timeline/Tracks/CurvePropertyTrack.cs
+++ b/Source/Editor/GUI/Timeline/Tracks/CurvePropertyTrack.cs
@@ -266,19 +266,8 @@ namespace FlaxEditor.GUI.Timeline.Tracks
         /// <inheritdoc />
         public override void OnTimelineChanged(Timeline timeline)
         {
-            if (Timeline != null)
-            {
-                Timeline.ShowPreviewValuesChanged -= OnTimelineShowPreviewValuesChanged;
-            }
-
             base.OnTimelineChanged(timeline);
 
-            if (Timeline != null)
-            {
-                _previewValue.Visible = Timeline.ShowPreviewValues;
-                Timeline.ShowPreviewValuesChanged += OnTimelineShowPreviewValuesChanged;
-            }
-
             if (Curve != null)
             {
                 Curve.Parent = timeline?.MediaPanel;
@@ -296,11 +285,6 @@ namespace FlaxEditor.GUI.Timeline.Tracks
             UpdatePreviewValue();
         }
 
-        private void OnTimelineShowPreviewValuesChanged()
-        {
-            _previewValue.Visible = Timeline.ShowPreviewValues;
-        }
-
         /// <inheritdoc />
         public override void OnTimelineZoomChanged()
         {
diff --git a/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs b/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
index cdd6fc83f..32e81e466 100644
--- a/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
+++ b/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
@@ -361,32 +361,14 @@ namespace FlaxEditor.GUI.Timeline.Tracks
         /// <inheritdoc />
         public override void OnTimelineChanged(Timeline timeline)
         {
-            if (Timeline != null)
-            {
-                Timeline.ShowPreviewValuesChanged -= OnTimelineShowPreviewValuesChanged;
-            }
-
             base.OnTimelineChanged(timeline);
 
-            if (Timeline != null)
-            {
-                if (_previewValue != null)
-                    _previewValue.Visible = Timeline.ShowPreviewValues;
-                Timeline.ShowPreviewValuesChanged += OnTimelineShowPreviewValuesChanged;
-            }
-
             Events.Parent = timeline?.MediaPanel;
             Events.FPS = timeline?.FramesPerSecond;
 
             UpdateEvents();
         }
 
-        private void OnTimelineShowPreviewValuesChanged()
-        {
-            if (_previewValue != null)
-                _previewValue.Visible = Timeline.ShowPreviewValues;
-        }
-
         /// <inheritdoc />
         public override void OnTimelineZoomChanged()
         {
diff --git a/Source/Editor/GUI/Timeline/Tracks/KeyframesPropertyTrack.cs b/Source/Editor/GUI/Timeline/Tracks/KeyframesPropertyTrack.cs
index db6a6aa0a..03291b3d2 100644
--- a/Source/Editor/GUI/Timeline/Tracks/KeyframesPropertyTrack.cs
+++ b/Source/Editor/GUI/Timeline/Tracks/KeyframesPropertyTrack.cs
@@ -325,19 +325,8 @@ namespace FlaxEditor.GUI.Timeline.Tracks
         /// <inheritdoc />
         public override void OnTimelineChanged(Timeline timeline)
         {
-            if (Timeline != null)
-            {
-                Timeline.ShowPreviewValuesChanged -= OnTimelineShowPreviewValuesChanged;
-            }
-
             base.OnTimelineChanged(timeline);
 
-            if (Timeline != null)
-            {
-                _previewValue.Visible = Timeline.ShowPreviewValues;
-                Timeline.ShowPreviewValuesChanged += OnTimelineShowPreviewValuesChanged;
-            }
-
             Keyframes.Parent = timeline?.MediaPanel;
             Keyframes.FPS = timeline?.FramesPerSecond;
 
@@ -353,11 +342,6 @@ namespace FlaxEditor.GUI.Timeline.Tracks
             UpdatePreviewValue();
         }
 
-        private void OnTimelineShowPreviewValuesChanged()
-        {
-            _previewValue.Visible = Timeline.ShowPreviewValues;
-        }
-
         /// <inheritdoc />
         public override void OnTimelineZoomChanged()
         {
diff --git a/Source/Editor/GUI/Timeline/Tracks/MemberTrack.cs b/Source/Editor/GUI/Timeline/Tracks/MemberTrack.cs
index 64beb855d..21ca444e4 100644
--- a/Source/Editor/GUI/Timeline/Tracks/MemberTrack.cs
+++ b/Source/Editor/GUI/Timeline/Tracks/MemberTrack.cs
@@ -293,6 +293,28 @@ namespace FlaxEditor.GUI.Timeline.Tracks
         {
         }
 
+        /// <inheritdoc />
+        public override void OnTimelineChanged(Timeline timeline)
+        {
+            if (Timeline != null && _previewValue != null)
+            {
+                Timeline.ShowPreviewValuesChanged -= OnTimelineShowPreviewValuesChanged;
+            }
+
+            base.OnTimelineChanged(timeline);
+
+            if (Timeline != null && _previewValue != null)
+            {
+                _previewValue.Visible = Timeline.ShowPreviewValues;
+                Timeline.ShowPreviewValuesChanged += OnTimelineShowPreviewValuesChanged;
+            }
+        }
+
+        private void OnTimelineShowPreviewValuesChanged()
+        {
+            _previewValue.Visible = Timeline.ShowPreviewValues;
+        }
+
         /// <inheritdoc />
         public override void Update(float deltaTime)
         {