diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts
index 9fbaebc389..4b02a555c6 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts
@@ -1,4 +1,5 @@
 const { rest } = window.MockServiceWorker;
+import type { UmbMockDocumentModel } from '../../data/document/document.data.js';
 import { umbDocumentMockDb } from '../../data/document/document.db.js';
 import { items as referenceData } from '../../data/tracked-reference.data.js';
 import { UMB_SLUG } from './slug.js';
@@ -77,8 +78,14 @@ export const detailHandlers = [
 	rest.get(umbracoPath(`${UMB_SLUG}/:id/available-segment-options`), (req, res, ctx) => {
 		const id = req.params.id as string;
 		if (!id) return res(ctx.status(400));
-		const document = umbDocumentMockDb.detail.read(id);
-		if (!document) return res(ctx.status(404));
+
+		let document: UmbMockDocumentModel | null = null;
+
+		try {
+			document = umbDocumentMockDb.detail.read(id);
+		} catch {
+			return res(ctx.status(404));
+		}
 
 		const availableSegments = document.variants.filter((v) => !!v.segment).map((v) => v.segment!) ?? [];
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/preview/workspace-action/save-and-preview.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/preview/workspace-action/save-and-preview.action.ts
index e622c57bf6..adac4f6286 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/preview/workspace-action/save-and-preview.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/preview/workspace-action/save-and-preview.action.ts
@@ -1,30 +1,9 @@
-import { UmbDocumentUserPermissionCondition } from '../../user-permissions/document/conditions/document-user-permission.condition.js';
-import { UMB_USER_PERMISSION_DOCUMENT_UPDATE } from '../../user-permissions/document/constants.js';
-import { UmbWorkspaceActionBase } from '@umbraco-cms/backoffice/workspace';
-import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { UmbDocumentSaveWorkspaceAction } from '../../workspace/actions/save.action.js';
 
-export class UmbDocumentSaveAndPreviewWorkspaceAction extends UmbWorkspaceActionBase {
-	constructor(host: UmbControllerHost, args: any) {
-		super(host, args);
-
-		/* The action is disabled by default because the onChange callback
-		 will first be triggered when the condition is changed to permitted */
-		this.disable();
-
-		const condition = new UmbDocumentUserPermissionCondition(host, {
-			host,
-			config: {
-				alias: 'Umb.Condition.UserPermission.Document',
-				allOf: [UMB_USER_PERMISSION_DOCUMENT_UPDATE],
-			},
-			onChange: () => {
-				if (condition.permitted) {
-					this.enable();
-				} else {
-					this.disable();
-				}
-			},
-		});
+export class UmbDocumentSaveAndPreviewWorkspaceAction extends UmbDocumentSaveWorkspaceAction {
+	override async execute() {
+		await this._retrieveWorkspaceContext;
+		await this._workspaceContext?.saveAndPreview();
 	}
 }
 
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 50d45001ff..6dadb4ae7c 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
@@ -332,7 +332,14 @@ export class UmbDocumentWorkspaceContext
 			firstVariantId = UmbVariantId.FromString(selected[0]);
 			const variantIds = [firstVariantId];
 			const saveData = await this._data.constructData(variantIds);
-			await this.runMandatoryValidationForSaveData(saveData);
+
+			// Run mandatory validation (checks for name, etc.)
+			await this.runMandatoryValidationForSaveData(saveData, variantIds);
+
+			// Ask server to validate and show validation tooltips (like the Save action does)
+			await this.askServerToValidate(saveData, variantIds);
+
+			// Perform save
 			await this.performCreateOrUpdate(variantIds, saveData);
 		}