WordPress · t-hamano · Sep 9, 2025 · Aug 25, 2025 · Aug 26, 2025 · Aug 28, 2025
diff --git a/packages/core-commands/src/admin-navigation-commands.js b/packages/core-commands/src/admin-navigation-commands.js
@@ -3,7 +3,10 @@
  */
 import { useCommandLoader } from '@wordpress/commands';
 import { __, sprintf } from '@wordpress/i18n';
+import { external } from '@wordpress/icons';
 import { useMemo } from '@wordpress/element';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
 
 const getAdminNavigationCommands = ( menuCommands ) =>
 	function useAdminBasicNavigationCommands() {
@@ -33,9 +36,48 @@ const getAdminNavigationCommands = ( menuCommands ) =>
 		};
 	};
 
+const getViewSiteCommand = () =>
+	function useViewSiteCommand() {
+		const homeUrl = useSelect( ( select ) => {
+			// Site index.
+			return select( coreStore ).getEntityRecord(
+				'root',
+				'__unstableBase'
+			)?.home;
+		}, [] );
+
+		const commands = useMemo( () => {
+			if ( ! homeUrl ) {
+				return [];
+			}
+
+			return [
+				{
+					name: 'core/view-site',
+					label: __( 'View site' ),
+					icon: external,
+					callback: ( { close } ) => {
+						close();
+						window.open( homeUrl, '_blank' );
+					},
+				},
+			];
+		}, [ homeUrl ] );
+
+		return {
+			isLoading: false,
+			commands,
+		};
+	};
+
 export function useAdminNavigationCommands( menuCommands ) {
 	useCommandLoader( {
 		name: 'core/admin-navigation',
 		hook: getAdminNavigationCommands( menuCommands ),
 	} );
+
+	useCommandLoader( {
+		name: 'core/view-site',
+		hook: getViewSiteCommand(),
+	} );
 }
diff --git a/packages/core-commands/src/site-editor-navigation-commands.js b/packages/core-commands/src/site-editor-navigation-commands.js
@@ -244,7 +244,7 @@ const getNavigationCommandLoaderPerTemplate = ( templateType ) =>
 			) {
 				result.push( {
 					name: 'core/edit-site/open-template-parts',
-					label: __( 'Template parts' ),
+					label: __( 'Go to: Template parts' ),
 					icon: symbolFilled,
 					callback: ( { close } ) => {
 						if ( isSiteEditor ) {
@@ -299,9 +299,10 @@ const getSiteEditorBasicNavigationCommands = () =>
 			const result = [];
 
 			if ( canCreateTemplate && isBlockBasedTheme ) {
+				// Go to Styles command
 				result.push( {
 					name: 'core/edit-site/open-styles',
-					label: __( 'Styles' ),
+					label: __( 'Go to: Styles' ),
 					icon: styles,
 					callback: ( { close } ) => {
 						if ( isSiteEditor ) {
@@ -320,7 +321,7 @@ const getSiteEditorBasicNavigationCommands = () =>
 
 				result.push( {
 					name: 'core/edit-site/open-navigation',
-					label: __( 'Navigation' ),
+					label: __( 'Go to: Navigation' ),
 					icon: navigation,
 					callback: ( { close } ) => {
 						if ( isSiteEditor ) {
@@ -339,7 +340,7 @@ const getSiteEditorBasicNavigationCommands = () =>
 
 				result.push( {
 					name: 'core/edit-site/open-pages',
-					label: __( 'Pages' ),
+					label: __( 'Go to: Pages' ),
 					icon: page,
 					callback: ( { close } ) => {
 						if ( isSiteEditor ) {
@@ -358,7 +359,7 @@ const getSiteEditorBasicNavigationCommands = () =>
 
 				result.push( {
 					name: 'core/edit-site/open-templates',
-					label: __( 'Templates' ),
+					label: __( 'Go to: Templates' ),
 					icon: layout,
 					callback: ( { close } ) => {
 						if ( isSiteEditor ) {
@@ -378,7 +379,7 @@ const getSiteEditorBasicNavigationCommands = () =>
 			if ( canCreatePatterns ) {
 				result.push( {
 					name: 'core/edit-site/open-patterns',
-					label: __( 'Patterns' ),
+					label: __( 'Go to: Patterns' ),
 					icon: symbol,
 					callback: ( { close } ) => {
 						if ( canCreateTemplate ) {
@@ -394,7 +395,7 @@ const getSiteEditorBasicNavigationCommands = () =>
 							}
 							close();
 						} else {
-							// If a user cannot access the site editor
+							// If a user cannot access the site editor.
 							document.location.href =
 								'edit.php?post_type=wp_block';
 						}

diff --git a/packages/edit-site/src/hooks/commands/use-common-commands.js b/packages/edit-site/src/hooks/commands/use-common-commands.js
@@ -4,16 +4,8 @@
 import { useMemo } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __, isRTL } from '@wordpress/i18n';
-import {
-	rotateLeft,
-	rotateRight,
-	backup,
-	help,
-	styles,
-	external,
-	brush,
-} from '@wordpress/icons';
-import { useCommandLoader, useCommand } from '@wordpress/commands';
+import { rotateLeft, rotateRight, help, brush, backup } from '@wordpress/icons';
+import { useCommandLoader } from '@wordpress/commands';
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { store as preferencesStore } from '@wordpress/preferences';
@@ -28,45 +20,6 @@ import { store as editSiteStore } from '../../store';
 const { useGlobalStylesReset } = unlock( blockEditorPrivateApis );
 const { useHistory, useLocation } = unlock( routerPrivateApis );
 
-const getGlobalStylesOpenStylesCommands = () =>
-	function useGlobalStylesOpenStylesCommands() {
-		const { openGeneralSidebar } = unlock( useDispatch( editSiteStore ) );
-		const { params } = useLocation();
-		const { canvas = 'view' } = params;
-		const history = useHistory();
-		const isBlockBasedTheme = useSelect( ( select ) => {
-			return select( coreStore ).getCurrentTheme().is_block_theme;
-		}, [] );
-
-		const commands = useMemo( () => {
-			if ( ! isBlockBasedTheme ) {
-				return [];
-			}
-
-			return [
-				{
-					name: 'core/edit-site/open-styles',
-					label: __( 'Open styles' ),
-					callback: ( { close } ) => {
-						close();
-						if ( canvas !== 'edit' ) {
-							history.navigate( '/styles?canvas=edit', {
-								transition: 'canvas-mode-edit-transition',
-							} );
-						}
-						openGeneralSidebar( 'edit-site/global-styles' );
-					},
-					icon: styles,
-				},
-			];
-		}, [ history, openGeneralSidebar, canvas, isBlockBasedTheme ] );
-
-		return {
-			isLoading: false,
-			commands,
-		};
-	};
-
 const getGlobalStylesToggleWelcomeGuideCommands = () =>
 	function useGlobalStylesToggleWelcomeGuideCommands() {
 		const { openGeneralSidebar } = unlock( useDispatch( editSiteStore ) );
@@ -171,7 +124,7 @@ const getGlobalStylesOpenCssCommands = () =>
 			return [
 				{
 					name: 'core/edit-site/open-styles-css',
-					label: __( 'Customize CSS' ),
+					label: __( 'Open custom CSS' ),
 					icon: brush,
 					callback: ( { close } ) => {
 						close();
@@ -192,6 +145,7 @@ const getGlobalStylesOpenCssCommands = () =>
 			canEditCSS,
 			canvas,
 		] );
+
 		return {
 			isLoading: false,
 			commands,
@@ -213,6 +167,7 @@ const getGlobalStylesOpenRevisionsCommands = () =>
 			const globalStyles = globalStylesId
 				? getEntityRecord( 'root', 'globalStyles', globalStylesId )
 				: undefined;
+
 			return !! globalStyles?._links?.[ 'version-history' ]?.[ 0 ]?.count;
 		}, [] );
 
@@ -223,8 +178,8 @@ const getGlobalStylesOpenRevisionsCommands = () =>
 
 			return [
 				{
-					name: 'core/edit-site/open-global-styles-revisions',
-					label: __( 'Style revisions' ),
+					name: 'core/edit-site/open-styles-revisions',
+					label: __( 'Open style revisions' ),
 					icon: backup,
 					callback: ( { close } ) => {
 						close();
@@ -241,10 +196,10 @@ const getGlobalStylesOpenRevisionsCommands = () =>
 				},
 			];
 		}, [
-			hasRevisions,
 			history,
 			openGeneralSidebar,
 			setEditorCanvasContainerView,
+			hasRevisions,
 			canvas,
 		] );
 
@@ -255,27 +210,6 @@ const getGlobalStylesOpenRevisionsCommands = () =>
 	};
 
 export function useCommonCommands() {
-	const homeUrl = useSelect( ( select ) => {
-		// Site index.
-		return select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
-			?.home;
-	}, [] );
-
-	useCommand( {
-		name: 'core/edit-site/view-site',
-		label: __( 'View site' ),
-		callback: ( { close } ) => {
-			close();
-			window.open( homeUrl, '_blank' );
-		},
-		icon: external,
-	} );
-
-	useCommandLoader( {
-		name: 'core/edit-site/open-styles',
-		hook: getGlobalStylesOpenStylesCommands(),
-	} );
-
 	useCommandLoader( {
 		name: 'core/edit-site/toggle-styles-welcome-guide',
 		hook: getGlobalStylesToggleWelcomeGuideCommands(),

diff --git a/test/e2e/specs/site-editor/command-center.spec.js b/test/e2e/specs/site-editor/command-center.spec.js
@@ -68,12 +68,8 @@ test.describe( 'Site editor command palette', () => {
 		await page
 			.getByRole( 'button', { name: 'Open command palette' } )
 			.click();
-		await page.keyboard.type( 'Customize' );
-		await page.getByRole( 'option', { name: 'customize css' } ).click();
-		await expect(
-			page
-				.getByRole( 'region', { name: 'Editor settings' } )
-				.getByLabel( 'Additional CSS' )
-		).toBeVisible();
+		await page.keyboard.type( 'custom CSS' );
+		await page.getByRole( 'option', { name: 'Open custom CSS' } ).click();
+		await expect( page.getByLabel( 'Additional CSS' ) ).toBeVisible();
 	} );
 } );