diff --git a/osu.Game.Tests/Visual/Online/TestCaseChannelTabControl.cs b/osu.Game.Tests/Visual/Online/TestCaseChannelTabControl.cs
index fdc3d5394f..85488e36e7 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.Name == "+")
+                if (first is ChannelSelectorTabChannel)
                     return true;
 
                 channelTabControl.RemoveChannel(first);
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 1165c77977..bf624ccbe7 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -10,6 +10,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.Chat.Tabs;
 using osu.Game.Users;
 
 namespace osu.Game.Online.Chat
@@ -86,7 +87,7 @@ namespace osu.Game.Online.Chat
 
         private void currentChannelChanged(ValueChangedEvent<Channel> e)
         {
-            if (e.NewValue?.Name != "+")
+            if (!(e.NewValue is ChannelSelectorTabChannel))
                 JoinChannel(e.NewValue);
         }
 
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index fa1c289007..a418fb1e78 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -199,10 +199,8 @@ namespace osu.Game.Overlays
                 return;
             }
 
-            if (e.NewValue.Name == "+")
-            {
+            if (e.NewValue is ChannelSelectorTabChannel)
                 return;
-            }
 
             textbox.Current.Disabled = e.NewValue.ReadOnly;
 
@@ -273,7 +271,7 @@ namespace osu.Game.Overlays
         private void selectTab(int index)
         {
             var channel = channelTabControl.Items.Skip(index).FirstOrDefault();
-            if (channel != null && channel.Name != "+")
+            if (channel != null && !(channel is ChannelSelectorTabChannel))
                 channelTabControl.Current.Value = channel;
         }