diff --git a/packages/bruno-app/src/components/Modal/index.js b/packages/bruno-app/src/components/Modal/index.js index 74b9ad3cd..7839c2dbf 100644 --- a/packages/bruno-app/src/components/Modal/index.js +++ b/packages/bruno-app/src/components/Modal/index.js @@ -82,6 +82,12 @@ const Modal = ({ const handleKeydown = (event) => { const { keyCode, shiftKey, ctrlKey, altKey, metaKey } = event; + + // Only handle events from elements inside this modal + if (keyCode !== ESC_KEY_CODE && (!modalRef.current || !modalRef.current.contains(event.target))) { + return; + } + switch (keyCode) { case ESC_KEY_CODE: { if (disableEscapeKey) return;