diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
similarity index 93%
rename from osu.Game.Tests/Visual/Online/TestSceneChatDisplay.cs
rename to osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 2789feef3d..c75348112f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -15,11 +15,10 @@ using osu.Game.Overlays.Chat.Tabs;
 namespace osu.Game.Tests.Visual.Online
 {
     [Description("Testing chat api and overlay")]
-    public class TestSceneChatDisplay : OsuTestScene
+    public class TestSceneChatOverlay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(ChatOverlay),
             typeof(ChatLine),
             typeof(DrawableChannel),
             typeof(ChannelSelectorTabItem),
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index e6f2983488..fce9862e8e 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Overlays
             channelTabControl.ChannelSelectorActive.ValueChanged += active => channelSelectionOverlay.State.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
             channelSelectionOverlay.State.ValueChanged += state =>
             {
-                if (state.NewValue == Visibility.Hidden && channelManager.CurrentChannel.Value == null)
+                if (state.NewValue == Visibility.Hidden && channelManager.JoinedChannels.Count == 0)
                 {
                     channelSelectionOverlay.Show();
                     Hide();