diff --git a/settings/src/components/revalidate-modal.js b/settings/src/components/revalidate-modal.js
index d735bb1b..3dbbafd2 100644
--- a/settings/src/components/revalidate-modal.js
+++ b/settings/src/components/revalidate-modal.js
@@ -17,6 +17,9 @@ export default function RevalidateModal() {
 			title="Two-Factor Authentication"
 			onRequestClose={ goBack }
 			className="wporg-2fa__revalidate-modal"
+			// Temporary workaround until https://github.com/WordPress/gutenberg/issues/40912 is fixed.
+			// Without this the modal immediately closes in Firefox, see https://github.com/WordPress/wporg-two-factor/issues/180
+			shouldCloseOnClickOutside={ false }
 		>
 			<p>To update your two-factor options, you must first revalidate your session.</p>