diff --git a/packages/edit-site/src/components/navigation-sidebar/navigation-toggle/index.js b/packages/edit-site/src/components/navigation-sidebar/navigation-toggle/index.js
index 0836a7f360..13d6371058 100644
--- a/packages/edit-site/src/components/navigation-sidebar/navigation-toggle/index.js
+++ b/packages/edit-site/src/components/navigation-sidebar/navigation-toggle/index.js
@@ -71,7 +71,10 @@ function NavigationToggle( { icon } ) {
 	}
 
 	const buttonRef = useRef();
-	useResetFocusOnRouteChange( buttonRef );
+	const props = {
+		isNavigationOpen,
+	};
+	useResetFocusOnRouteChange( buttonRef, props );
 
 	return (
 		<motion.div
diff --git a/packages/edit-site/src/components/routes/use-reset-focus-on-route-change.js b/packages/edit-site/src/components/routes/use-reset-focus-on-route-change.js
index aba2ab5efc..7ce13e8389 100644
--- a/packages/edit-site/src/components/routes/use-reset-focus-on-route-change.js
+++ b/packages/edit-site/src/components/routes/use-reset-focus-on-route-change.js
@@ -13,7 +13,7 @@ import { useRef, useEffect } from '@wordpress/element';
  */
 import { useLocation, useHistory } from './index';
 
-export default function useResetFocusOnRouteChange( targetRef ) {
+export default function useResetFocusOnRouteChange( targetRef, props = null ) {
 	const history = useHistory();
 	const location = useLocation();
 	const isInitialPageLoadRef = useRef( true );
@@ -35,6 +35,10 @@ export default function useResetFocusOnRouteChange( targetRef ) {
 			}
 		}
 
+		if ( props !== null && props.isNavigationOpen ) {
+			return;
+		}
+
 		targetRef.current?.focus();
-	}, [ location, targetRef, history ] );
+	}, [ location, targetRef, history, props ] );
 }