diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneChatOverlayScenarios.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneChatOverlayScenarios.cs
index 3d78e91087..987d711917 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneChatOverlayScenarios.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneChatOverlayScenarios.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestTabControl : ChannelTabControl
         {
-            protected override TabItem<Channel> CreateTabItem(Channel value) => new TestChannelTabItem(value) { OnRequestClose = TabCloseRequested };
+            protected override TabItem<Channel> CreateTabItem(Channel value) => new TestChannelTabItem(value);
 
             public new IReadOnlyDictionary<Channel, TabItem<Channel>> TabMap => base.TabMap;
         }
diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
index b96cb27767..612379d339 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
@@ -49,6 +49,8 @@ namespace osu.Game.Overlays.Chat.Tabs
                 // performTabSort might've made selectorTab's position wonky, fix it
                 TabContainer.SetLayoutPosition(selectorTab, float.MaxValue);
 
+            ((ChannelTabItem)item).OnRequestClose += tabCloseRequested;
+
             base.AddTabItem(item, addToDropdown);
         }
 
@@ -57,10 +59,10 @@ namespace osu.Game.Overlays.Chat.Tabs
             switch (value.Type)
             {
                 default:
-                    return new ChannelTabItem(value) { OnRequestClose = TabCloseRequested };
+                    return new ChannelTabItem(value);
 
                 case ChannelType.PM:
-                    return new PrivateChannelTabItem(value) { OnRequestClose = TabCloseRequested };
+                    return new PrivateChannelTabItem(value);
             }
         }
 
@@ -103,7 +105,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             selectorTab.Active.Value = false;
         }
 
-        protected void TabCloseRequested(TabItem<Channel> tab)
+        private void tabCloseRequested(TabItem<Channel> tab)
         {
             int totalTabs = TabContainer.Count - 1; // account for selectorTab
             int currentIndex = MathHelper.Clamp(TabContainer.IndexOf(tab), 1, totalTabs);
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 475d691e7c..bc94fb1cb8 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -158,13 +158,12 @@ namespace osu.Game.Overlays
                                     Colour = Color4.Black,
                                 },
                                 ChannelTabControl = CreateChannelTabControl().With(d =>
-                                    {
-                                        d.Anchor = Anchor.BottomLeft;
-                                        d.Origin = Anchor.BottomLeft;
-                                        d.RelativeSizeAxes = Axes.Both;
-                                        d.OnRequestLeave = channelManager.LeaveChannel;
-                                    }
-                                ),
+                                {
+                                    d.Anchor = Anchor.BottomLeft;
+                                    d.Origin = Anchor.BottomLeft;
+                                    d.RelativeSizeAxes = Axes.Both;
+                                    d.OnRequestLeave = channelManager.LeaveChannel;
+                                }),
                             }
                         },
                     },