diff --git a/addons/mail/static/src/core/common/chat_window_container.xml b/addons/mail/static/src/core/common/chat_window_container.xml
index 31b02851889..e69842193c6 100644
--- a/addons/mail/static/src/core/common/chat_window_container.xml
+++ b/addons/mail/static/src/core/common/chat_window_container.xml
@@ -13,7 +13,7 @@
 </t>
 
 <t t-name="mail.ChatWindowHiddenMenu">
-    <Dropdown position="'top-end'" menuClass="'p-0'" togglerClass="'o-mail-ChatWindowHiddenToggler btn d-flex align-items-center rounded-top-3 bg-900'">
+    <Dropdown position="'top-end'" menuClass="'o-mail-ChatWindowHiddenMenu p-0'" togglerClass="'o-mail-ChatWindowHiddenToggler btn d-flex align-items-center rounded-top-3 bg-900'">
         <t t-set-slot="toggler">
             <div class="me-1 fa fa-comments-o"/>
             <div class="mx-1 text-truncate" t-esc="chatWindowService.hidden.length"/>
diff --git a/addons/mail/static/src/core/common/chat_window_service.js b/addons/mail/static/src/core/common/chat_window_service.js
index 88aad52d196..9dfa6acfd30 100644
--- a/addons/mail/static/src/core/common/chat_window_service.js
+++ b/addons/mail/static/src/core/common/chat_window_service.js
@@ -153,7 +153,7 @@ export class ChatWindowService {
     }
 
     close(chatWindow, { escape = false } = {}) {
-        if (this.maxVisible < this.store.chatWindows.length) {
+        if (!chatWindow.hidden && this.maxVisible < this.store.chatWindows.length) {
             const swaped = this.hidden[0];
             swaped.hidden = false;
             swaped.folded = false;
diff --git a/addons/mail/static/tests/chat_window/chat_window_tests.js b/addons/mail/static/tests/chat_window/chat_window_tests.js
index 639e235643a..4526f649653 100644
--- a/addons/mail/static/tests/chat_window/chat_window_tests.js
+++ b/addons/mail/static/tests/chat_window/chat_window_tests.js
@@ -430,6 +430,45 @@ QUnit.test("open 3 different chat windows: not enough screen width", async (asse
     );
 });
 
+QUnit.test("closing hidden chat window", async (assert) => {
+    const pyEnv = await startServer();
+    pyEnv["discuss.channel"].create([
+        { name: "Ch_1" },
+        { name: "Ch_2" },
+        { name: "Ch_3" },
+        { name: "Ch_4" },
+    ]);
+    patchUiSize({ width: 900 });
+    assert.ok(
+        CHAT_WINDOW_END_GAP_WIDTH * 2 + CHAT_WINDOW_WIDTH * 2 + CHAT_WINDOW_INBETWEEN_WIDTH < 900,
+        "should have enough space to open 2 chat windows simultaneously"
+    );
+    assert.ok(
+        CHAT_WINDOW_END_GAP_WIDTH * 2 + CHAT_WINDOW_WIDTH * 3 + CHAT_WINDOW_INBETWEEN_WIDTH * 2 >
+            900,
+        "should not have enough space to open 3 chat windows simultaneously"
+    );
+    await start();
+    await click("i[aria-label='Messages']");
+    await click(".o-mail-NotificationItem:contains(Ch_1)");
+    await click("i[aria-label='Messages']");
+    await click(".o-mail-NotificationItem:contains(Ch_2)");
+    await click("i[aria-label='Messages']");
+    await click(".o-mail-NotificationItem:contains(Ch_3)");
+    await click("i[aria-label='Messages']");
+    await click(".o-mail-NotificationItem:contains(Ch_4)");
+    await click(".o-mail-ChatWindowHiddenToggler");
+    assert.containsOnce($, ":not(.o-mail-ChatWindowHiddenMenu) .o-mail-ChatWindow:contains(Ch_1)");
+    assert.containsOnce($, ".o-mail-ChatWindowHiddenMenu .o-mail-ChatWindow:contains(Ch_2)");
+    assert.containsOnce($, ".o-mail-ChatWindowHiddenMenu .o-mail-ChatWindow:contains(Ch_3)");
+    assert.containsOnce($, ":not(.o-mail-ChatWindowHiddenMenu) .o-mail-ChatWindow:contains(Ch_4)");
+    await click(".o-mail-ChatWindow:contains(Ch_2) [title='Close Chat Window']");
+    assert.containsOnce($, ":not(.o-mail-ChatWindowHiddenMenu) .o-mail-ChatWindow:contains(Ch_1)");
+    assert.containsNone($, ".o-mail-ChatWindow:contains(Ch_2)");
+    assert.containsOnce($, ".o-mail-ChatWindowHiddenMenu .o-mail-ChatWindow:contains(Ch_3)");
+    assert.containsOnce($, ":not(.o-mail-ChatWindowHiddenMenu) .o-mail-ChatWindow:contains(Ch_4)");
+});
+
 QUnit.test(
     "focus next visible chat window when closing current chat window with ESCAPE [REQUIRE FOCUS]",
     async (assert) => {