diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
index 15ae423ad5ddb..6281134e8c95e 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
@@ -4,20 +4,24 @@
import { edit } from '@wordpress/icons';
import { Button } from '@wordpress/components';
import { useDispatch } from '@wordpress/data';
+import { forwardRef } from '@wordpress/element';
/**
* Internal dependencies
*/
import { store as blockEditorStore } from '../../store';
-const BlockEditButton = ( { label, clientId } ) => {
+export default forwardRef( function BlockEditButton(
+ { clientId, ...props },
+ ref
+) {
const { selectBlock } = useDispatch( blockEditorStore );
const onClick = () => {
selectBlock( clientId );
};
- return ;
-};
-
-export default BlockEditButton;
+ return (
+
+ );
+} );
diff --git a/packages/block-editor/src/components/off-canvas-editor/block.js b/packages/block-editor/src/components/off-canvas-editor/block.js
index a0bf8529a4d01..c88f5ed0f7bbf 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block.js
@@ -145,6 +145,7 @@ function ListViewBlock( {
const { isTreeGridMounted, expand, collapse } = useListViewContext();
+ const isEditable = block.name !== 'core/page-list-item';
const hasSiblings = siblingBlockCount > 0;
const hasRenderedMovers = showBlockMovers && hasSiblings;
const moverCellClassName = classnames(
@@ -330,12 +331,15 @@ function ListViewBlock( {
!! isSelected || forceSelectionContentLock
}
>
- { () => (
-
- ) }
+ { ( props ) =>
+ isEditable && (
+
+ )
+ }