diff --git a/packages/block-editor/src/components/block-tools/block-selection-button.js b/packages/block-editor/src/components/block-tools/block-selection-button.js index 4ae00b6f4610ff..3a091a40185202 100644 --- a/packages/block-editor/src/components/block-tools/block-selection-button.js +++ b/packages/block-editor/src/components/block-tools/block-selection-button.js @@ -166,8 +166,9 @@ function BlockSelectionButton( { clientId, rootClientId, blockElement } ) { } const startingBlockClientId = hasBlockMovingClientId(); - if ( isEscape && startingBlockClientId ) { + if ( isEscape && startingBlockClientId && ! event.defaultPrevented ) { setBlockMovingClientId( null ); + event.preventDefault(); } if ( ( isEnter || isSpace ) && startingBlockClientId ) { const sourceRoot = getBlockRootClientId( startingBlockClientId ); diff --git a/packages/block-editor/src/components/media-replace-flow/index.js b/packages/block-editor/src/components/media-replace-flow/index.js index b96ea2f4bae3db..da419d038ee5bb 100644 --- a/packages/block-editor/src/components/media-replace-flow/index.js +++ b/packages/block-editor/src/components/media-replace-flow/index.js @@ -18,7 +18,7 @@ import { withFilters, } from '@wordpress/components'; import { withDispatch, useSelect } from '@wordpress/data'; -import { DOWN, TAB, ESCAPE } from '@wordpress/keycodes'; +import { DOWN } from '@wordpress/keycodes'; import { compose } from '@wordpress/compose'; import { upload, media as mediaIcon } from '@wordpress/icons'; import { store as noticesStore } from '@wordpress/notices'; @@ -164,23 +164,7 @@ const MediaReplaceFlow = ( { { onSelectURL && ( // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions -