diff --git a/Source/Editor/GUI/Timeline/Media.cs b/Source/Editor/GUI/Timeline/Media.cs
index 6d6a4c5ea..b97717ec8 100644
--- a/Source/Editor/GUI/Timeline/Media.cs
+++ b/Source/Editor/GUI/Timeline/Media.cs
@@ -400,8 +400,9 @@ namespace FlaxEditor.GUI.Timeline
                 }
                 else
                 {
-                    // Select (additive for the move)
-                    _timeline.Select(this, true);
+                    // Select
+                    if (!_timeline.SelectedMedia.Contains(this))
+                        _timeline.Select(this);
                 }
 
                 _timeline.OnKeyframesMove(null, this, location, true, false);
diff --git a/Source/Editor/GUI/Timeline/Timeline.cs b/Source/Editor/GUI/Timeline/Timeline.cs
index e254c7456..d2ade10eb 100644
--- a/Source/Editor/GUI/Timeline/Timeline.cs
+++ b/Source/Editor/GUI/Timeline/Timeline.cs
@@ -1560,6 +1560,7 @@ namespace FlaxEditor.GUI.Timeline
                 track.AddMedia(media);
             }
             MarkAsEdited();
+            Select(media);
         }
 
         /// <summary>
@@ -1922,6 +1923,7 @@ namespace FlaxEditor.GUI.Timeline
             }
             else
             {
+                OnKeyframesDeselect(null);
                 foreach (var track in _tracks)
                 {
                     if (Mathf.IsInRange(timelinePos.Y, track.Top, track.Bottom))