From f1fd7bc52390e8ad781ef5e84376c0772d00134d Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Wed, 30 Sep 2026 08:25:06 +0000
Subject: [PATCH] Fix modals unintentionally closing when clicking on menu
 items (#40758)

---
 app/javascript/mastodon/components/modal_root.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/modal_root.jsx b/app/javascript/mastodon/components/modal_root.jsx
index c1c2e9b068e..90267bff681 100644
--- a/app/javascript/mastodon/components/modal_root.jsx
+++ b/app/javascript/mastodon/components/modal_root.jsx
@@ -61,9 +61,11 @@ class ModalRoot extends PureComponent {
 
   handleBackgroundClick = (e) => {
     // Close modal, but only when clicking outside of the modal's content
-    if (!e.target.matches('.modal-root__container *')) {
-      this.props.onClose();
+    if (e.target.matches('.modal-root__container *') || !e.target.matches('.modal-root *')) {
+      return;
     }
+
+    this.props.onClose();
   }
 
   componentDidMount () {