diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-repository-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-repository-base.ts
index 628fb319af..11fdb527ba 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-repository-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-repository-base.ts
@@ -86,7 +86,7 @@ export abstract class UmbDetailRepositoryBase<DetailModelType extends { unique:
 			this.#notificationContext!.peek('positive', notification);
 		}
 
-		return { error };
+		return { data: createdData, error };
 	}
 
 	/**
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/script-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/script-detail.server.data-source.ts
index b29e8eaa12..614b2e206a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/script-detail.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/script-detail.server.data-source.ts
@@ -89,9 +89,11 @@ export class UmbScriptDetailServerDataSource implements UmbDetailDataSource<UmbS
 	async update(data: UmbScriptDetailModel) {
 		if (!data.unique) throw new Error('Unique is missing');
 
+		const existingPath = this.#serverPathUniqueSerializer.toServerPath(data.unique);
+
 		// TODO: make data mapper to prevent errors
 		const requestBody: UpdateTextFileViewModelBaseModel = {
-			existingPath: this.#serverPathUniqueSerializer.toServerPath(data.unique),
+			existingPath,
 			name: data.name,
 			content: data.content,
 		};
@@ -107,17 +109,23 @@ export class UmbScriptDetailServerDataSource implements UmbDetailDataSource<UmbS
 			return { error };
 		}
 
+		// TODO: should we get this as part of the PUT response?
+		const parentPath = this.#serverPathUniqueSerializer.toServerPath(data.parentUnique);
+		const newFilePath = parentPath + '/' + requestBody.name;
+		const newPathUnique = this.#serverPathUniqueSerializer.toUnique(newFilePath);
 		// We have to fetch the data type again. The server can have modified the data after update
-		return this.read(data.unique);
+		return this.read(newPathUnique);
 	}
 
 	async delete(unique: string) {
 		if (!unique) throw new Error('Unique is missing');
 
+		const path = this.#serverPathUniqueSerializer.toServerPath(unique);
+
 		return tryExecuteAndNotify(
 			this.#host,
 			ScriptResource.deleteScript({
-				path: this.#serverPathUniqueSerializer.toServerPath(unique),
+				path,
 			}),
 		);
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts
index 8672ecd526..24a907ffcd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts
@@ -71,13 +71,20 @@ export class UmbScriptWorkspaceContext extends UmbEditableWorkspaceContextBase<
 	async save() {
 		if (!this.#data.value) throw new Error('Data is missing');
 
+		let newData = undefined;
+
 		if (this.getIsNew()) {
-			await this.repository.create(this.#data.value);
+			const { data } = await this.repository.create(this.#data.value);
+			newData = data;
 		} else {
-			await this.repository.save(this.#data.value);
+			const { data } = await this.repository.save(this.#data.value);
+			newData = data;
 		}
 
-		this.saveComplete(this.#data.value);
+		if (newData) {
+			this.#data.next(newData);
+			this.saveComplete(newData);
+		}
 	}
 
 	destroy(): void {