diff --git a/packages/block-editor/src/components/block-toolbar/index.native.js b/packages/block-editor/src/components/block-toolbar/index.native.js
index 5413e4e1f9cded..38908cf68335a7 100644
--- a/packages/block-editor/src/components/block-toolbar/index.native.js
+++ b/packages/block-editor/src/components/block-toolbar/index.native.js
@@ -4,9 +4,10 @@
 import { withSelect } from '@wordpress/data';
 
 /**
- * WordPress dependencies
+ * Internal dependencies
  */
-import { BlockFormatControls, BlockControls } from '@wordpress/block-editor';
+import BlockControls from '../block-controls';
+import BlockFormatControls from '../block-format-controls';
 
 export const BlockToolbar = ( { blockClientIds, isValid, mode } ) => {
 	if ( blockClientIds.length === 0 ) {
diff --git a/packages/block-library/src/heading/edit.native.js b/packages/block-library/src/heading/edit.native.js
index 356494ea933b38..ac8a0e755278cd 100644
--- a/packages/block-library/src/heading/edit.native.js
+++ b/packages/block-library/src/heading/edit.native.js
@@ -31,6 +31,7 @@ const HeadingEdit = ( {
 				maxLevel={ 7 }
 				selectedLevel={ attributes.level }
 				onChange={ ( newLevel ) => setAttributes( { level: newLevel } ) }
+				isCollapsed={ false }
 			/>
 		</BlockControls>
 		<RichText