Exit template focus when opening the W menu (#52235)

WordPress · Jul 5, 2023 · 7ac218c · 7ac218c
1 parent 38904e9
commit 7ac218c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/edit-site/src/store/private-actions.js b/packages/edit-site/src/store/private-actions.js
@@ -11,7 +11,7 @@ import { store as preferencesStore } from '@wordpress/preferences';
  */
 export const setCanvasMode =
 	( mode ) =>
-	( { registry, dispatch } ) => {
+	( { registry, dispatch, select } ) => {
 		registry.dispatch( blockEditorStore ).__unstableSetEditorMode( 'edit' );
 		dispatch( {
 			type: 'SET_CANVAS_MODE',
@@ -26,6 +26,10 @@ export const setCanvasMode =
 		) {
 			dispatch.setIsListViewOpened( true );
 		}
+		// Switch focus away from editing the template when switching to view mode.
+		if ( mode === 'view' && select.isPage() ) {
+			dispatch.setHasPageContentFocus( true );
+		}
 	};
 
 /**