Fix escape events not stopping propagation to customizer

packages/block-editor/src/components/writing-flow/use-tab-nav.js

@@ -91,6 +91,7 @@ export default function useTabNav() {
 	const ref = useRefEffect( ( node ) => {
 		function onKeyDown( event ) {
 			if ( event.keyCode === ESCAPE && ! hasMultiSelection() ) {
+				event.stopPropagation();
 				setNavigationMode( true );
 				return;
 			}

packages/components/src/popover/index.js

@@ -10,6 +10,7 @@ import {
 	useRef,
 	useState,
 	useLayoutEffect,
+	useEffect,
 	forwardRef,
 } from '@wordpress/element';
 import { getRectangleFromRange } from '@wordpress/dom';
@@ -490,18 +491,25 @@ const Popover = (
 	] );
 
 	// Event handlers
-	const maybeClose = ( event ) => {
-		// Close on escape
-		if ( event.keyCode === ESCAPE && onClose ) {
-			event.stopPropagation();
-			onClose();
-		}
+	useEffect( () => {
+		const container = containerRef.current;
+
+		if ( container ) {
+			function maybeClose( event ) {
+				// Close on escape
+				if ( event.keyCode === ESCAPE && onClose ) {
+					event.stopPropagation();
+					onClose();
+				}
+			}
 
-		// Preserve original content prop behavior
-		if ( onKeyDown ) {
-			onKeyDown( event );
+			container.addEventListener( 'keydown', maybeClose );
+
+			return () => {
+				container.removeEventListener( 'keydown', maybeClose );
+			};
 		}
-	};
+	}, [ onClose ] );
 
 	/**
 	 * Shims an onFocusOutside callback to be compatible with a deprecated
@@ -587,7 +595,7 @@ const Popover = (
 				}
 			) }
 			{ ...contentProps }
-			onKeyDown={ maybeClose }
+			onKeyDown={ onKeyDown }
 			{ ...focusOutsideProps }
 			ref={ mergedRefs }
 			tabIndex="-1"