diff --git a/osu.Game/Overlays/Chat/ChatTabControl.cs b/osu.Game/Overlays/Chat/ChatTabControl.cs
index 5f8db6fa71..c11e474b76 100644
--- a/osu.Game/Overlays/Chat/ChatTabControl.cs
+++ b/osu.Game/Overlays/Chat/ChatTabControl.cs
@@ -57,6 +57,9 @@ protected override void AddTabItem(TabItem<Channel> item, bool addToDropdown = t
                 TabContainer.ChangeChildDepth(selectorTab, float.MaxValue);
 
             base.AddTabItem(item, addToDropdown);
+
+            if (SelectedTab == null)
+                SelectTab(item);
         }
 
         protected override TabItem<Channel> CreateTabItem(Channel value)
@@ -149,7 +152,7 @@ private void fadeInactive()
             protected override bool OnHover(InputState state)
             {
                 closeButton?.FadeIn(1f, Easing.InBounce);
-                
+
                 if (!Active)
                     box.FadeColour(backgroundHover, transition_length, Easing.OutQuint);
                 return true;
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 855fb5a1d6..6f8bf69779 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -398,7 +398,10 @@ private void removeChannel(Channel channel)
             if (channel == null) return;
 
             if (channel == CurrentChannel)
+            {
+                currentChannel = null;
                 currentChannelContainer.Clear(false);
+            }
 
             careChannels.Remove(channel);
             loadedChannels.Remove(loadedChannels.Find(c => c.Channel == channel));