diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-view-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-view-detail.server.data-source.ts
index df1a900838..542370513b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-view-detail.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-view-detail.server.data-source.ts
@@ -45,23 +45,20 @@ export class UmbPartialViewDetailServerDataSource implements UmbDetailDataSource
 			content: partialView.content,
 		};
 
-		const { error } = await tryExecuteAndNotify(
+		const { data, error } = await tryExecuteAndNotify(
 			this.#host,
 			PartialViewResource.postPartialView({
 				requestBody,
 			}),
 		);
 
-		if (error) {
-			return { error };
+		if (data) {
+			const newPath = decodeURIComponent(data);
+			const newPathUnique = this.#serverPathUniqueSerializer.toUnique(newPath);
+			return this.read(newPathUnique);
 		}
 
-		// We have to fetch the data again. The server can have modified the data after creation
-		// TODO: revisit when location header is added
-		const createdPartialViewPath = parentPath ? parentPath + '/' + requestBody.name : requestBody.name;
-		const createdPartialViewUnique = this.#serverPathUniqueSerializer.toUnique(createdPartialViewPath);
-
-		return this.read(createdPartialViewUnique);
+		return { error };
 	}
 
 	async read(unique: string) {
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 5ba5e212b1..d9cc26ceed 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
@@ -53,8 +53,9 @@ export class UmbScriptDetailServerDataSource implements UmbDetailDataSource<UmbS
 		);
 
 		if (data) {
-			const createdScriptUnique = this.#serverPathUniqueSerializer.toUnique(data);
-			return this.read(createdScriptUnique);
+			const newPath = decodeURIComponent(data);
+			const newPathUnique = this.#serverPathUniqueSerializer.toUnique(newPath);
+			return this.read(newPathUnique);
 		}
 
 		return { error };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet-detail.server.data-source.ts
index aa3e248216..a0f68059ba 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet-detail.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet-detail.server.data-source.ts
@@ -45,23 +45,20 @@ export class UmbStylesheetDetailServerDataSource implements UmbDetailDataSource<
 			content: stylesheet.content,
 		};
 
-		const { error } = await tryExecuteAndNotify(
+		const { data, error } = await tryExecuteAndNotify(
 			this.#host,
 			StylesheetResource.postStylesheet({
 				requestBody,
 			}),
 		);
 
-		if (error) {
-			return { error };
+		if (data) {
+			const newPath = decodeURIComponent(data);
+			const newPathUnique = this.#serverPathUniqueSerializer.toUnique(newPath);
+			return this.read(newPathUnique);
 		}
 
-		// We have to fetch the data again. The server can have modified the data after creation
-		// TODO: revisit when location header is added
-		const createdStylesheetPath = parentPath ? parentPath + '/' + requestBody.name : requestBody.name;
-		const createdStylesheetUnique = this.#serverPathUniqueSerializer.toUnique(createdStylesheetPath);
-
-		return this.read(createdStylesheetUnique);
+		return { error };
 	}
 
 	async read(unique: string) {