diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 4f386972fa..99f31b0c2a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
@@ -27,12 +28,12 @@ namespace osu.Game.Tests.Visual.Editing
         private BlueprintContainer blueprintContainer
             => Editor.ChildrenOfType<BlueprintContainer>().First();
 
-        private void moveMouseToObject(HitObject obj)
+        private void moveMouseToObject(Func<HitObject> targetFunc)
         {
             AddStep("move mouse to object", () =>
             {
                 var pos = blueprintContainer.SelectionBlueprints
-                                            .First(s => s.HitObject == obj)
+                                            .First(s => s.HitObject == targetFunc())
                                             .ChildrenOfType<HitCirclePiece>()
                                             .First().ScreenSpaceDrawQuad.Centre;
 
@@ -46,7 +47,7 @@ namespace osu.Game.Tests.Visual.Editing
             var addedObject = new HitCircle { StartTime = 100 };
             AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
 
-            moveMouseToObject(addedObject);
+            moveMouseToObject(() => addedObject);
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
 
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
@@ -60,7 +61,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("add one more hitobject", () => EditorBeatmap.Add(addedObject2));
             AddAssert("selection unchanged", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
 
-            moveMouseToObject(addedObject2);
+            moveMouseToObject(() => addedObject2);
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject2);
         }
@@ -78,33 +79,69 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects));
 
-            moveMouseToObject(addedObjects[0]);
+            moveMouseToObject(() => addedObjects[0]);
             AddStep("click first", () => InputManager.Click(MouseButton.Left));
 
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObjects[0]);
 
             AddStep("hold control", () => InputManager.PressKey(Key.ControlLeft));
 
-            moveMouseToObject(addedObjects[1]);
+            moveMouseToObject(() => addedObjects[1]);
             AddStep("click second", () => InputManager.Click(MouseButton.Left));
             AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
 
-            moveMouseToObject(addedObjects[2]);
+            moveMouseToObject(() => addedObjects[2]);
             AddStep("click third", () => InputManager.Click(MouseButton.Left));
             AddAssert("3 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 3 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[2]));
 
-            moveMouseToObject(addedObjects[1]);
+            moveMouseToObject(() => addedObjects[1]);
             AddStep("click second", () => InputManager.Click(MouseButton.Left));
             AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && !EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
         }
 
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestMultiSelectFromDrag(bool alreadySelectedBeforeDrag)
+        {
+            HitCircle[] addedObjects = null;
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 200, Position = new Vector2(50) },
+                new HitCircle { StartTime = 300, Position = new Vector2(100) },
+                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+            }));
+
+            moveMouseToObject(() => addedObjects[0]);
+            AddStep("click first", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("hold control", () => InputManager.PressKey(Key.ControlLeft));
+
+            moveMouseToObject(() => addedObjects[1]);
+
+            if (alreadySelectedBeforeDrag)
+                AddStep("click second", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("mouse down on second", () => InputManager.PressButton(MouseButton.Left));
+
+            AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
+
+            AddStep("drag to centre", () => InputManager.MoveMouseTo(blueprintContainer.ScreenSpaceDrawQuad.Centre));
+
+            AddAssert("positions changed", () => addedObjects[0].Position != Vector2.Zero && addedObjects[1].Position != new Vector2(50));
+
+            AddStep("release control", () => InputManager.ReleaseKey(Key.ControlLeft));
+            AddStep("mouse up", () => InputManager.ReleaseButton(MouseButton.Left));
+        }
+
         [Test]
         public void TestBasicDeselect()
         {
             var addedObject = new HitCircle { StartTime = 100 };
             AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
 
-            moveMouseToObject(addedObject);
+            moveMouseToObject(() => addedObject);
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
 
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
@@ -127,7 +164,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
 
-            moveMouseToObject(addedObject);
+            moveMouseToObject(() => addedObject);
 
             AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
             AddStep("right click", () => InputManager.Click(MouseButton.Right));