diff --git a/packages/block-editor/src/components/block-toolbar/index.js b/packages/block-editor/src/components/block-toolbar/index.js
index 984670762262c9..0f76c27bed16d8 100644
--- a/packages/block-editor/src/components/block-toolbar/index.js
+++ b/packages/block-editor/src/components/block-toolbar/index.js
@@ -186,18 +186,18 @@ export function PrivateBlockToolbar( {
disabled={ ! isDefaultEditingMode }
isUsingBindings={ isUsingBindings }
/>
- { isDefaultEditingMode && (
- <>
- { ! isMultiToolbar && (
-
- ) }
-
- >
+ { isDefaultEditingMode && ! isMultiToolbar && (
+
+ ) }
+
+ { ( isDefaultEditingMode ||
+ isContentOnlyEditingMode ) && (
+
) }
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index 8d4d94bdaa98f7..1f430f97e3b212 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -1767,6 +1767,11 @@ export function canMoveBlock( state, clientId ) {
if ( getTemplateLock( state, rootClientId ) === 'all' ) {
return false;
}
+
+ if ( getBlockEditingMode( state, clientId ) === 'contentOnly' ) {
+ return true;
+ }
+
return getBlockEditingMode( state, rootClientId ) !== 'disabled';
}