diff --git a/osu.Game/Overlays/Chat/ChatTabControl.cs b/osu.Game/Overlays/Chat/ChatTabControl.cs
index 9f38b81e68..62d24289b1 100644
--- a/osu.Game/Overlays/Chat/ChatTabControl.cs
+++ b/osu.Game/Overlays/Chat/ChatTabControl.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Chat
 {
     public class ChatTabControl : OsuTabControl<Channel>
     {
-        protected override TabItem<Channel> CreateTabItem(Channel value) => value.Id == -1 ? new ChannelTabItem.ChannelSelectorTabItem(value) : new ChannelTabItem(value);
+        protected override TabItem<Channel> CreateTabItem(Channel value) => value.Id == ChatOverlay.CHANNEL_SELECTOR_ID ? new ChannelTabItem.ChannelSelectorTabItem(value) : new ChannelTabItem(value);
 
         private const float shear_width = 10;
 
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 5e998bff51..57c7c2cd69 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -264,12 +264,13 @@ namespace osu.Game.Overlays
             {
                 if (currentChannel == value) return;
 
-                if(value.Id == CHANNEL_SELECTOR_ID)
+                if (value.Id == CHANNEL_SELECTOR_ID)
                 {
                     //channel selector popout
                     currentChannel = value;
                     return;
-                }else if(currentChannel?.Id == CHANNEL_SELECTOR_ID)
+                }
+                else if (currentChannel?.Id == CHANNEL_SELECTOR_ID)
                 {
                     //channel selector popin
                 }