diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
index 0ea8f97d8c..0951d51f30 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts
@@ -123,10 +123,9 @@ export class UmbTemplateWorkspaceContext
 
 		if (updateLayoutBlock) {
 			this.#updateMasterTemplateLayoutBlock();
+			this._data.updateCurrent({ masterTemplate: unique ? { unique } : null });
 		}
 
-		this._data.updateCurrent({ masterTemplate: unique ? { unique } : null });
-
 		return unique;
 	}