diff --git a/osu.Game/Beatmaps/Drawable/Panel.cs b/osu.Game/Beatmaps/Drawable/Panel.cs
index b1f3189b36..fe633e4958 100644
--- a/osu.Game/Beatmaps/Drawable/Panel.cs
+++ b/osu.Game/Beatmaps/Drawable/Panel.cs
@@ -22,16 +22,14 @@ namespace osu.Game.Beatmaps.Drawable
         public Panel()
         {
             Height = MAX_HEIGHT;
-
-            Masking = true;
-            CornerRadius = 10;
-            BorderColour = new Color4(221, 255, 255, 255);
-
             RelativeSizeAxes = Axes.X;
 
             AddInternal(nestedContainer = new Container
             {
                 RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                CornerRadius = 10,
+                BorderColour = new Color4(221, 255, 255, 255),
             });
         }
 
@@ -77,9 +75,8 @@ namespace osu.Game.Beatmaps.Drawable
 
         protected virtual void Selected()
         {
-            BorderThickness = 2.5f;
-
-            EdgeEffect = new EdgeEffect
+            nestedContainer.BorderThickness = 2.5f;
+            nestedContainer.EdgeEffect = new EdgeEffect
             {
                 Type = EdgeEffectType.Glow,
                 Colour = new Color4(130, 204, 255, 150),
@@ -90,9 +87,8 @@ namespace osu.Game.Beatmaps.Drawable
 
         protected virtual void Deselected()
         {
-            BorderThickness = 0;
-
-            EdgeEffect = new EdgeEffect
+            nestedContainer.BorderThickness = 0;
+            nestedContainer.EdgeEffect = new EdgeEffect
             {
                 Type = EdgeEffectType.Shadow,
                 Offset = new Vector2(1),
diff --git a/osu.Game/Screens/Select/CarouselContainer.cs b/osu.Game/Screens/Select/CarouselContainer.cs
index 0247a65fc4..f072380e3c 100644
--- a/osu.Game/Screens/Select/CarouselContainer.cs
+++ b/osu.Game/Screens/Select/CarouselContainer.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Screens.Select
             float halfHeight = drawHeight / 2;
             foreach (Panel panel in scrollableContent.Children)
             {
-                float panelDrawY = panel.Position.Y - Current;
+                float panelDrawY = panel.Position.Y - Current + panel.DrawHeight / 2;
                 float dist = Math.Abs(1f - panelDrawY / halfHeight);
 
                 // Setting the origin position serves as an additive position on top of potential