diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts
index f6215d8e57..22d659ff64 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts
@@ -23,11 +23,13 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext<
 	#areaKey?: string | null;
 
 	setParentUnique(contentUdi: string | null) {
+		this._workspaceModal.setUniquePathValue('parentUnique', contentUdi ?? 'null');
 		this.#catalogueModal.setUniquePathValue('parentUnique', contentUdi ?? 'null');
 	}
 
 	setAreaKey(areaKey: string | null) {
 		this.#areaKey = areaKey;
+		this._workspaceModal.setUniquePathValue('areaKey', areaKey ?? 'null');
 		this.#catalogueModal.setUniquePathValue('areaKey', areaKey ?? 'null');
 		this.#gotAreaKey();
 	}
@@ -35,6 +37,8 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext<
 	constructor(host: UmbControllerHost) {
 		super(host, UMB_BLOCK_GRID_MANAGER_CONTEXT);
 
+		this._workspaceModal.addUniquePaths(['parentUnique', 'areaKey']);
+
 		this.#retrieveParentEntry = this.consumeContext(UMB_BLOCK_GRID_ENTRY_CONTEXT, (blockGridEntry) => {
 			this.#parentEntry = blockGridEntry;
 			this.#gotBlockParentEntry();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entries.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entries.context.ts
index 4db308f448..8f9418b267 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entries.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entries.context.ts
@@ -21,7 +21,7 @@ export abstract class UmbBlockEntriesContext<
 	_manager?: BlockManagerContextType;
 	_retrieveManager;
 
-	#workspaceModal: UmbModalRouteRegistrationController;
+	_workspaceModal: UmbModalRouteRegistrationController;
 
 	#workspacePath = new UmbStringState(undefined);
 	workspacePath = this.#workspacePath.asObservable();
@@ -41,7 +41,7 @@ export abstract class UmbBlockEntriesContext<
 			this.observe(
 				this._manager.propertyAlias,
 				(alias) => {
-					this.#workspaceModal.setUniquePathValue('propertyAlias', alias);
+					this._workspaceModal.setUniquePathValue('propertyAlias', alias);
 				},
 				'observePropertyAlias',
 			);
@@ -49,13 +49,13 @@ export abstract class UmbBlockEntriesContext<
 				this._manager.variantId,
 				(variantId) => {
 					// TODO: This might not be the property variant ID, but the content variant ID. Check up on what makes most sense?
-					this.#workspaceModal.setUniquePathValue('variantId', variantId?.toString());
+					this._workspaceModal.setUniquePathValue('variantId', variantId?.toString());
 				},
 				'observePropertyVariantId',
 			);
 		}).asPromise();
 
-		this.#workspaceModal = new UmbModalRouteRegistrationController(this, UMB_BLOCK_WORKSPACE_MODAL)
+		this._workspaceModal = new UmbModalRouteRegistrationController(this, UMB_BLOCK_WORKSPACE_MODAL)
 			.addUniquePaths(['propertyAlias', 'variantId'])
 			.addAdditionalPath('block')
 			.onSetup(() => {