diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
index 2f6322a046..ad57341d18 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -120,12 +120,15 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
         {
             base.UpdatePreemptState();
 
-            FadeIn(200);
             circleContainer.ScaleTo(1, 400, EasingTypes.OutElastic);
 
-            background.Delay(TIME_PREEMPT - 100);
+            background.Delay(TIME_PREEMPT - 500);
+
+            background.ScaleTo(scaleToCircle * 1.2f, 400, EasingTypes.OutQuint);
             background.FadeIn(200);
-            background.ScaleTo(1, 200, EasingTypes.OutQuint);
+
+            background.Delay(400);
+            background.ScaleTo(1, 250, EasingTypes.OutQuint);
 
             disc.Delay(TIME_PREEMPT - 50);
             disc.FadeIn(200);
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index e982f52b44..31da815bbe 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 
         private int completeTick;
 
-        private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 720));
+        private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 360));
 
         protected override void Update()
         {
diff --git a/osu.Game/Beatmaps/Drawables/Panel.cs b/osu.Game/Beatmaps/Drawables/Panel.cs
index 5899f250b4..2e5f5f248b 100644
--- a/osu.Game/Beatmaps/Drawables/Panel.cs
+++ b/osu.Game/Beatmaps/Drawables/Panel.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Beatmaps.Drawables
                 CornerRadius = 10,
                 BorderColour = new Color4(221, 255, 255, 255),
             });
+
+            Alpha = 0;
         }
 
         public void SetMultiplicativeAlpha(float alpha)
diff --git a/osu.Game/Screens/Play/SkipButton.cs b/osu.Game/Screens/Play/SkipButton.cs
index 8770a9d9b9..fab2210757 100644
--- a/osu.Game/Screens/Play/SkipButton.cs
+++ b/osu.Game/Screens/Play/SkipButton.cs
@@ -4,8 +4,10 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
+using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using OpenTK.Input;
 
 namespace osu.Game.Screens.Play
 {
@@ -28,5 +30,19 @@ namespace osu.Game.Screens.Play
             Colour = colours.Yellow;
             HoverColour = colours.YellowDark;
         }
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            if (args.Repeat) return false;
+
+            switch (args.Key)
+            {
+                case Key.Space:
+                    TriggerClick();
+                    return true;
+            }
+
+            return base.OnKeyDown(state, args);
+        }
     }
 }