diff --git a/osu.Game.Tests/Visual/Online/TestCaseChannelTabControl.cs b/osu.Game.Tests/Visual/Online/TestCaseChannelTabControl.cs
index 85488e36e7..356ede0d57 100644
--- a/osu.Game.Tests/Visual/Online/TestCaseChannelTabControl.cs
+++ b/osu.Game.Tests/Visual/Online/TestCaseChannelTabControl.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Tests.Visual.Online
             AddUntilStep("remove all channels", () =>
             {
                 var first = channelTabControl.Items.First();
-                if (first is ChannelSelectorTabChannel)
+                if (first is ChannelSelectorTabItem.ChannelSelectorTabChannel)
                     return true;
 
                 channelTabControl.RemoveChannel(first);
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index bf624ccbe7..2efc9f4968 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Online.Chat
 
         private void currentChannelChanged(ValueChangedEvent<Channel> e)
         {
-            if (!(e.NewValue is ChannelSelectorTabChannel))
+            if (!(e.NewValue is ChannelSelectorTabItem.ChannelSelectorTabChannel))
                 JoinChannel(e.NewValue);
         }
 
diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabChannel.cs b/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabChannel.cs
deleted file mode 100644
index 39c570b239..0000000000
--- a/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabChannel.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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 osu.Game.Online.Chat;
-
-namespace osu.Game.Overlays.Chat.Tabs
-{
-    public class ChannelSelectorTabChannel : Channel
-    {
-        public ChannelSelectorTabChannel()
-        {
-            Name = "+";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs b/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs
index 9f22ab6923..7386bffb1a 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs
@@ -31,5 +31,13 @@ namespace osu.Game.Overlays.Chat.Tabs
             BackgroundInactive = colour.Gray2;
             BackgroundActive = colour.Gray3;
         }
+
+        public class ChannelSelectorTabChannel : Channel
+        {
+            public ChannelSelectorTabChannel()
+            {
+                Name = "+";
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index a418fb1e78..eb95fabe02 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -199,7 +199,7 @@ namespace osu.Game.Overlays
                 return;
             }
 
-            if (e.NewValue is ChannelSelectorTabChannel)
+            if (e.NewValue is ChannelSelectorTabItem.ChannelSelectorTabChannel)
                 return;
 
             textbox.Current.Disabled = e.NewValue.ReadOnly;
@@ -271,7 +271,7 @@ namespace osu.Game.Overlays
         private void selectTab(int index)
         {
             var channel = channelTabControl.Items.Skip(index).FirstOrDefault();
-            if (channel != null && !(channel is ChannelSelectorTabChannel))
+            if (channel != null && !(channel is ChannelSelectorTabItem.ChannelSelectorTabChannel))
                 channelTabControl.Current.Value = channel;
         }