diff --git a/packages/bruno-app/src/components/Modal/index.js b/packages/bruno-app/src/components/Modal/index.js index 35828b30e..74b9ad3cd 100644 --- a/packages/bruno-app/src/components/Modal/index.js +++ b/packages/bruno-app/src/components/Modal/index.js @@ -88,7 +88,9 @@ const Modal = ({ return closeModal({ type: 'esc' }); } case ENTER_KEY_CODE: { - if (!shiftKey && !ctrlKey && !altKey && !metaKey && handleConfirm) { + // Skip if a submit button is focused - let native button click handle it to avoid double-fire + const isSubmitButton = event.target?.type === 'submit'; + if (!shiftKey && !ctrlKey && !altKey && !metaKey && handleConfirm && !isSubmitButton) { return handleConfirm(); } }