diff --git a/addons/mail/static/src/core/common/chat_window.js b/addons/mail/static/src/core/common/chat_window.js
index 805cce56518..6d7c2d4bd13 100644
--- a/addons/mail/static/src/core/common/chat_window.js
+++ b/addons/mail/static/src/core/common/chat_window.js
@@ -78,6 +78,9 @@ export class ChatWindow extends Component {
     }
 
     onKeydown(ev) {
+        if (ev.target.closest(".o-dropdown")) {
+            return;
+        }
         switch (ev.key) {
             case "Escape":
                 if (
diff --git a/addons/mail/static/src/core/common/chat_window.xml b/addons/mail/static/src/core/common/chat_window.xml
index 661b037b394..24859b7a496 100644
--- a/addons/mail/static/src/core/common/chat_window.xml
+++ b/addons/mail/static/src/core/common/chat_window.xml
@@ -10,7 +10,7 @@
                 'position-absolute bottom-0 overflow-hidden d-flex flex-column': !props.chatWindow.hidden,
                 'rounded-top-3': !props.chatWindow.hidden and !ui.isSmall,
                 }"
-        t-on-keydown.stop="onKeydown"
+        t-on-keydown="onKeydown"
         tabindex="1"
     >
         <div class="o-mail-ChatWindow-header d-flex align-items-center flex-shrink-0 bg-100" t-on-click="onClickHeader" t-att-class="{ 'cursor-pointer': !ui.isSmall, 'border-bottom': !props.chatWindow.folded }">
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 d6e203d7737..a84b803f61d 100644
--- a/addons/mail/static/tests/chat_window/chat_window_tests.js
+++ b/addons/mail/static/tests/chat_window/chat_window_tests.js
@@ -1023,3 +1023,56 @@ QUnit.test("Open chat window of new inviter", async (assert) => {
         ".o_notification:contains(Newbie connected. This is their first connection. Wish them luck.)"
     );
 });
+
+QUnit.test(
+    "keyboard navigation ArrowUp/ArrowDown on message action dropdown in chat window",
+    async (assert) => {
+        const pyEnv = await startServer();
+        const channelId = pyEnv["discuss.channel"].create({ name: "General" });
+        pyEnv["mail.message"].create({
+            author_id: pyEnv.currentPartnerId,
+            body: "not empty",
+            model: "discuss.channel",
+            res_id: channelId,
+        });
+        await start();
+        await click(".o_menu_systray i[aria-label='Messages']");
+        await click(".o-mail-NotificationItem");
+        await afterNextRender(() => {
+            $(".o-mail-Message")[0].dispatchEvent(new window.MouseEvent("mouseenter"));
+        });
+        await click(".o-mail-Message [title='Expand']");
+        $(".o-mail-Message [title='Expand']")[0].focus(); // necessary otherwise focus is in composer input
+        assert.containsOnce($, ".o-mail-Message-moreMenu.dropdown-menu");
+        await triggerHotkey("ArrowDown");
+        assert.containsOnce($, ".o-mail-Message-moreMenu .dropdown-item:eq(0).focus");
+        await triggerHotkey("ArrowDown");
+        assert.containsOnce($, ".o-mail-Message-moreMenu .dropdown-item:eq(1).focus");
+    }
+);
+
+QUnit.test(
+    "Close dropdown in chat window with ESCAPE does not also close the chat window",
+    async (assert) => {
+        const pyEnv = await startServer();
+        const channelId = pyEnv["discuss.channel"].create({ name: "General" });
+        pyEnv["mail.message"].create({
+            author_id: pyEnv.currentPartnerId,
+            body: "not empty",
+            model: "discuss.channel",
+            res_id: channelId,
+        });
+        await start();
+        await click(".o_menu_systray i[aria-label='Messages']");
+        await click(".o-mail-NotificationItem");
+        await afterNextRender(() => {
+            $(".o-mail-Message")[0].dispatchEvent(new window.MouseEvent("mouseenter"));
+        });
+        await click(".o-mail-Message [title='Expand']");
+        $(".o-mail-Message [title='Expand']")[0].focus(); // necessary otherwise focus is in composer input
+        assert.containsOnce($, ".o-mail-Message-moreMenu.dropdown-menu");
+        await triggerHotkey("Escape");
+        assert.containsNone($, ".o-mail-Message-moreMenu.dropdown-menu");
+        assert.containsOnce($, ".o-mail-ChatWindow");
+    }
+);