diff --git a/osu.Game.Rulesets.Osu.Tests/TestCaseSpinnerPlacementMask.cs b/osu.Game.Rulesets.Osu.Tests/TestCaseSpinnerPlacementMask.cs
new file mode 100644
index 0000000000..c2c7942c57
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestCaseSpinnerPlacementMask.cs
@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Edit.Masks.SpinnerMasks;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestCaseSpinnerPlacementMask : HitObjectPlacementMaskTestCase
+    {
+        protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableSpinner((Spinner)hitObject);
+
+        protected override PlacementMask CreateMask() => new SpinnerPlacementMask();
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/SpinnerMasks/SpinnerPlacementMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/SpinnerMasks/SpinnerPlacementMask.cs
new file mode 100644
index 0000000000..cd5d6cff04
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/SpinnerMasks/SpinnerPlacementMask.cs
@@ -0,0 +1,45 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Osu.Edit.Masks.SpinnerMasks.Components;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+
+namespace osu.Game.Rulesets.Osu.Edit.Masks.SpinnerMasks
+{
+    public class SpinnerPlacementMask : PlacementMask
+    {
+        public new Spinner HitObject => (Spinner)base.HitObject;
+
+        private readonly SpinnerPiece piece;
+
+        private bool isPlacingEnd;
+
+        public SpinnerPlacementMask()
+            : base(new Spinner { Position = OsuPlayfield.BASE_SIZE / 2 })
+        {
+            InternalChild = piece = new SpinnerPiece(HitObject) { Alpha = 0.5f };
+        }
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            if (isPlacingEnd)
+            {
+                HitObject.EndTime = EditorClock.CurrentTime;
+                EndPlacement();
+            }
+            else
+            {
+                HitObject.StartTime = EditorClock.CurrentTime;
+
+                isPlacingEnd = true;
+                piece.FadeTo(1f, 150, Easing.OutQuint);
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 386665ab7c..a1629803c0 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -28,9 +28,10 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected override RulesetContainer<OsuHitObject> CreateRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap)
             => new OsuEditRulesetContainer(ruleset, beatmap);
 
-        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new[]
+        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
             new HitCircleCompositionTool(),
+            new SpinnerCompositionTool()
         };
 
         protected override Container CreateLayerContainer() => new PlayfieldAdjustmentContainer { RelativeSizeAxes = Axes.Both };
diff --git a/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs b/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs
new file mode 100644
index 0000000000..a1419fe281
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs
@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Osu.Edit.Masks.SpinnerMasks;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public class SpinnerCompositionTool : HitObjectCompositionTool
+    {
+        public SpinnerCompositionTool()
+            : base(nameof(Spinner))
+        {
+        }
+
+        public override PlacementMask CreatePlacementMask() => new SpinnerPlacementMask();
+    }
+}