diff --git a/src/components/modal.jsx b/src/components/modal.jsx
index 2fc00fba..dfe7b535 100644
--- a/src/components/modal.jsx
+++ b/src/components/modal.jsx
@@ -20,9 +20,17 @@ function Modal({ children, onClose, onClick, class: className }) {
     return () => clearTimeout(timer);
   }, []);
 
-  const escRef = useHotkeys('esc', onClose, [onClose], {
-    enabled: !!onClose,
-  });
+  const escRef = useHotkeys(
+    'esc',
+    onClose,
+    {
+      enabled: !!onClose,
+      keydown: false,
+      keyup: true,
+      // This will run "later" to prevent clash with esc handlers from other components
+    },
+    [onClose],
+  );
 
   const Modal = (
     <div
diff --git a/src/pages/status.jsx b/src/pages/status.jsx
index d4b6c4d3..7e2017f1 100644
--- a/src/pages/status.jsx
+++ b/src/pages/status.jsx
@@ -537,6 +537,10 @@ function StatusThread({ id, closeLink = '/', instance: propInstance }) {
       // If media is open, esc to close media first
       // Else close the status page
       enabled: !showMedia,
+      ignoreEventWhen: (e) => {
+        const hasModal = !!document.querySelector('#modal-container > *');
+        return hasModal;
+      },
     },
   );
   // For backspace, will always close both media and status page