From a689fea4ec9c4fdce180028a0114a1f3596c1b5f Mon Sep 17 00:00:00 2001
From: Mitchell Austin <mr.fye@oneandthesame.net>
Date: Tue, 20 Jun 2023 12:41:53 -0700
Subject: [PATCH] Ensure return of focus from modal when closed

---
 packages/components/src/modal/index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/modal/index.tsx b/packages/components/src/modal/index.tsx
index 847c754137b4b..734344da4df45 100644
--- a/packages/components/src/modal/index.tsx
+++ b/packages/components/src/modal/index.tsx
@@ -174,7 +174,11 @@ function UnforwardedModal(
 	);
 
 	const onOverlayPress: PointerEventHandler< HTMLDivElement > = ( event ) => {
-		if ( event.target === event.currentTarget ) onRequestClose( event );
+		if ( event.target === event.currentTarget ) {
+			// Retains focus within the modal so that `useFocusReturn` works.
+			event.preventDefault();
+			onRequestClose( event );
+		}
 	};
 
 	return createPortal(