diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index 75c43770f7e175..dc90f351732524 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -3041,9 +3041,7 @@ export const getBlockEditingMode = createRegistrySelector(
 				clientId = '';
 			}
 
-			const isNavMode =
-				select( preferencesStore )?.get( 'core', 'editorTool' ) ===
-				'navigation';
+			const isNavMode = isNavigationMode( state );
 
 			// If the editor is currently not in navigation mode, check if the clientId
 			// has an editing mode set in the regular derived map.