diff --git a/packages/edit-site/src/components/navigation-inspector/index.js b/packages/edit-site/src/components/navigation-inspector/index.js
index e25cb30d7b180..7c3553743779c 100644
--- a/packages/edit-site/src/components/navigation-inspector/index.js
+++ b/packages/edit-site/src/components/navigation-inspector/index.js
@@ -174,7 +174,10 @@ export default function NavigationInspector( { onSelect } ) {
 					onChange={ onChange }
 					onInput={ onInput }
 				>
-					<NavigationMenu onSelect={ onSelect } />
+					<NavigationMenu
+						innerBlocks={ publishedInnerBlocks }
+						onSelect={ onSelect }
+					/>
 				</BlockEditorProvider>
 			) }
 
diff --git a/packages/edit-site/src/components/navigation-inspector/navigation-menu.js b/packages/edit-site/src/components/navigation-inspector/navigation-menu.js
index 56ad6b9fac762..731cb3cf9a3b0 100644
--- a/packages/edit-site/src/components/navigation-inspector/navigation-menu.js
+++ b/packages/edit-site/src/components/navigation-inspector/navigation-menu.js
@@ -8,7 +8,7 @@ import {
 	BlockTools,
 } from '@wordpress/block-editor';
 import { useEffect } from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useDispatch } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -39,15 +39,7 @@ const ALLOWED_BLOCKS = {
 	'core/page-list': [ 'core/page-list-item' ],
 };
 
-export default function NavigationMenu( { onSelect } ) {
-	const { clientIdsTree, innerBlocks } = useSelect( ( select ) => {
-		const { __unstableGetClientIdsTree, getBlocks } =
-			select( blockEditorStore );
-		return {
-			clientIdsTree: __unstableGetClientIdsTree(),
-			innerBlocks: getBlocks(),
-		};
-	} );
+export default function NavigationMenu( { innerBlocks, onSelect } ) {
 	const { updateBlockListSettings } = useDispatch( blockEditorStore );
 
 	const { OffCanvasEditor, LeafMoreMenu } = unlock( blockEditorPrivateApis );
@@ -72,7 +64,7 @@ export default function NavigationMenu( { onSelect } ) {
 	return (
 		<>
 			<OffCanvasEditor
-				blocks={ clientIdsTree }
+				blocks={ innerBlocks }
 				onSelect={ onSelect }
 				LeafMoreMenu={ LeafMoreMenu }
 			/>
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js
index b16b0f5c0ee08..336c8a92b458e 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js
@@ -31,7 +31,6 @@ export default function SidebarNavigationScreenNavigationMenus() {
 				history.push( {
 					postType: 'page',
 					postId: attributes.id,
-					path: '/navigation/single',
 				} );
 			}
 		},