diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
index 1bc79d33fb..d3a961829c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
@@ -201,7 +201,7 @@ export class UmbVariantSelectorElement extends UmbLitElement {
 
 	render() {
 		return html`
-			<uui-input id="name-input" .value=${this._name} @input="${this.#handleInput}">
+			<uui-input id="name-input" .value=${this._name ?? ''} @input="${this.#handleInput}">
 				${
 					this._variants?.length
 						? html`
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
index 71c8ddaf86..c8f10f7792 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
@@ -148,6 +148,7 @@ export class UmbDocumentWorkspaceContext
 	}
 
 	setName(name: string, variantId?: UmbVariantId) {
+		/*
 		const oldVariants = this.#currentData.getValue()?.variants || [];
 		const variants = partialUpdateFrozenArray(
 			oldVariants,
@@ -155,8 +156,9 @@ export class UmbDocumentWorkspaceContext
 			variantId ? (x) => variantId.compare(x) : () => true,
 		);
 		this.#currentData.update({ variants });
+		*/
 		// TODO: We should move this type of logic to the act of saving [NL]
-		this.#ensureVariantDataFor(variantId ?? UmbVariantId.CreateInvariant());
+		this.#updateVariantData(variantId ?? UmbVariantId.CreateInvariant(), { name });
 	}
 
 	setTemplate(templateUnique: string) {
@@ -209,7 +211,7 @@ export class UmbDocumentWorkspaceContext
 			this.#currentData.update({ values });
 
 			// TODO: We should move this type of logic to the act of saving [NL]
-			this.#ensureVariantDataFor(variantId);
+			this.#updateVariantData(variantId);
 		}
 	}
 
@@ -245,7 +247,7 @@ export class UmbDocumentWorkspaceContext
 		);
 	}
 
-	#ensureVariantDataFor(variantId: UmbVariantId) {
+	#updateVariantData(variantId: UmbVariantId, update?: Partial<UmbDocumentVariantModel>) {
 		const currentData = this.getData();
 		if (!currentData) throw new Error('Data is missing');
 		const variant = currentData.variants.find((x) => variantId.compare(x));
@@ -259,6 +261,7 @@ export class UmbDocumentWorkspaceContext
 				updateDate: null,
 				...variantId.toObject(),
 				...variant,
+				...update,
 			},
 			(x) => variantId.compare(x),
 		);