diff --git a/osu.Game/Overlays/Chat/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelListItem.cs
index 94e3438d87..ba6818026e 100644
--- a/osu.Game/Overlays/Chat/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelListItem.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
@@ -82,6 +82,7 @@ namespace osu.Game.Overlays.Chat
                                     Origin = Anchor.TopRight,
                                     Icon = FontAwesome.fa_check_circle,
                                     TextSize = text_size,
+                                    Shadow = false,
                                     Margin = new MarginPadding { Right = 10f },
                                     Alpha = 0f,
                                 },
@@ -97,6 +98,7 @@ namespace osu.Game.Overlays.Chat
                                 {
                                     TextSize = text_size,
                                     Font = @"Exo2.0-Bold",
+                                    Shadow = false,
                                 },
                             },
                         },
@@ -111,6 +113,7 @@ namespace osu.Game.Overlays.Chat
                                 {
                                     TextSize = text_size,
                                     Font = @"Exo2.0-SemiBold",
+                                    Shadow = false,
                                     Alpha = 0.8f,
                                 },
                             },
@@ -127,6 +130,7 @@ namespace osu.Game.Overlays.Chat
                                 {
                                     Icon = FontAwesome.fa_user,
                                     TextSize = text_size - 2,
+                                    Shadow = false,
                                     Margin = new MarginPadding { Top = 1 },
                                 },
                                 new OsuSpriteText
@@ -134,6 +138,7 @@ namespace osu.Game.Overlays.Chat
                                     Text = @"0",
                                     TextSize = text_size,
                                     Font = @"Exo2.0-SemiBold",
+                                    Shadow = false,
                                 },
                             },
                         },
diff --git a/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs b/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs
index 7187b9df40..249bd13094 100644
--- a/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs
+++ b/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
@@ -21,7 +21,7 @@ using osu.Game.Online.Chat;
 
 namespace osu.Game.Overlays.Chat
 {
-    public class ChannelSelectionOverlay : FocusedOverlayContainer
+    public class ChannelSelectionOverlay : OverlayContainer
     {
         public static readonly float WIDTH_PADDING = 170;
 
@@ -87,7 +87,7 @@ namespace osu.Game.Overlays.Chat
                             LayoutDuration = 200,
                             LayoutEasing = EasingTypes.OutQuint,
                             Spacing = new Vector2(0f, 20f),
-                            Padding = new MarginPadding { Top = 20, Left = WIDTH_PADDING, Right = WIDTH_PADDING },
+                            Padding = new MarginPadding { Top = 20, Bottom = 20, Left = WIDTH_PADDING, Right = WIDTH_PADDING },
                         },
                     },
                 },
@@ -114,6 +114,7 @@ namespace osu.Game.Overlays.Chat
                                 {
                                     Text = @"Chat Channels",
                                     TextSize = 20,
+                                    Shadow = false,
                                 },
                                 search = new HeaderSearchTextBox
                                 {
@@ -146,8 +147,6 @@ namespace osu.Game.Overlays.Chat
 
         protected override void PopIn()
         {
-            base.PopIn();
-
             search.HoldFocus = true;
             Schedule(() => search.TriggerFocus());
 
@@ -157,8 +156,6 @@ namespace osu.Game.Overlays.Chat
 
         protected override void PopOut()
         {
-            base.PopOut();
-
             search.HoldFocus = false;
 
             FadeOut(500, EasingTypes.InQuint);