From 6b0800304c89bfa32c820fc39dacd98a3e67b384 Mon Sep 17 00:00:00 2001
From: Mitchell Austin <mr.fye@oneandthesame.net>
Date: Sat, 19 Aug 2023 19:07:07 -0700
Subject: [PATCH] Fix focus return when dismissed

---
 packages/components/src/modal/index.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/components/src/modal/index.tsx b/packages/components/src/modal/index.tsx
index d21a3f9ae3535e..4bb05241f76606 100644
--- a/packages/components/src/modal/index.tsx
+++ b/packages/components/src/modal/index.tsx
@@ -10,7 +10,6 @@ import type { ForwardedRef, KeyboardEvent, UIEvent } from 'react';
 import {
 	createPortal,
 	useCallback,
-	useEffect,
 	useRef,
 	useState,
 	forwardRef,
@@ -100,7 +99,7 @@ function UnforwardedModal(
 		}
 	}, [ contentRef ] );
 
-	useEffect( () => {
+	useLayoutEffect( () => {
 		openModalCount++;
 
 		if ( openModalCount === 1 ) {