diff --git a/packages/block-editor/src/components/block-mover/index.js b/packages/block-editor/src/components/block-mover/index.js
index 71009a102e5d68..aaaf6c64b55953 100644
--- a/packages/block-editor/src/components/block-mover/index.js
+++ b/packages/block-editor/src/components/block-mover/index.js
@@ -62,7 +62,7 @@ function BlockMover( {
orientation: getBlockListSettings( _rootClientId )?.orientation,
isManualGrid:
layout.type === 'grid' &&
- !! layout.columnCount &&
+ layout.isManualPlacement &&
window.__experimentalEnableGridInteractivity,
};
},
diff --git a/packages/block-editor/src/components/grid/grid-item-resizer.js b/packages/block-editor/src/components/grid/grid-item-resizer.js
index a5847d852e0a96..6f6fa655b35568 100644
--- a/packages/block-editor/src/components/grid/grid-item-resizer.js
+++ b/packages/block-editor/src/components/grid/grid-item-resizer.js
@@ -19,7 +19,7 @@ export function GridItemResizer( {
} ) {
const blockElement = useBlockElement( clientId );
const rootBlockElement = blockElement?.parentElement;
- const { columnCount } = parentLayout;
+ const { isManualPlacement } = parentLayout;
if ( ! blockElement || ! rootBlockElement ) {
return null;
@@ -33,7 +33,8 @@ export function GridItemResizer( {
rootBlockElement={ rootBlockElement }
onChange={ onChange }
isManualGrid={
- !! columnCount && window.__experimentalEnableGridInteractivity
+ isManualPlacement &&
+ window.__experimentalEnableGridInteractivity
}
/>
);
diff --git a/packages/block-editor/src/components/grid/grid-visualizer.js b/packages/block-editor/src/components/grid/grid-visualizer.js
index 5e639615a062cf..41ceed87796999 100644
--- a/packages/block-editor/src/components/grid/grid-visualizer.js
+++ b/packages/block-editor/src/components/grid/grid-visualizer.js
@@ -32,7 +32,7 @@ export function GridVisualizer( { clientId, contentRef, parentLayout } ) {
}
const isManualGrid =
- parentLayout?.columnCount &&
+ parentLayout?.isManualPlacement &&
window.__experimentalEnableGridInteractivity;
return (
) }
- { isManualGrid && window.__experimentalEnableGridInteractivity && (
-
- ) }
+ { isManualPlacement &&
+ window.__experimentalEnableGridInteractivity && (
+
+ ) }
>
);
}