diff --git a/src/Umbraco.Web.UI.Client/libs/entity-action/actions/delete/delete.action.ts b/src/Umbraco.Web.UI.Client/libs/entity-action/actions/delete/delete.action.ts
index 53651b87a4..e6d9deb818 100644
--- a/src/Umbraco.Web.UI.Client/libs/entity-action/actions/delete/delete.action.ts
+++ b/src/Umbraco.Web.UI.Client/libs/entity-action/actions/delete/delete.action.ts
@@ -32,10 +32,8 @@ export class UmbDeleteEntityAction<
 				confirmLabel: 'Delete',
 			});
 
-			const { confirmed } = await modalHandler.onSubmit();
-			if (confirmed) {
-				await this.repository?.delete(this.unique);
-			}
+			await modalHandler.onSubmit();
+			await this.repository?.delete(this.unique);
 		}
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/libs/entity-action/actions/trash/trash.action.ts b/src/Umbraco.Web.UI.Client/libs/entity-action/actions/trash/trash.action.ts
index a1253b6c86..36ade2fef0 100644
--- a/src/Umbraco.Web.UI.Client/libs/entity-action/actions/trash/trash.action.ts
+++ b/src/Umbraco.Web.UI.Client/libs/entity-action/actions/trash/trash.action.ts
@@ -32,10 +32,8 @@ export class UmbTrashEntityAction<
 				confirmLabel: 'Trash',
 			});
 
-			modalHandler?.onSubmit().then(({ confirmed }) => {
-				if (confirmed) {
-					this.repository?.trash([this.unique]);
-				}
+			modalHandler?.onSubmit().then(() => {
+				this.repository?.trash([this.unique]);
 			});
 		}
 	}
diff --git a/src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout-picker-base.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout-picker-base.ts
index d3596350d3..2b18b6f281 100644
--- a/src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout-picker-base.ts
+++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout-picker-base.ts
@@ -24,7 +24,7 @@ export class UmbModalLayoutPickerBase<T> extends UmbModalLayoutElement<UmbPicker
 	}
 
 	close() {
-		this.modalHandler?.submit();
+		this.modalHandler?.close();
 	}
 
 	protected _handleKeydown(e: KeyboardEvent, key: string) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts
index 5db055f41e..5ad4c67c93 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts
@@ -1,8 +1,8 @@
 import { css, html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
-import { UmbDocumentPickerModalData } from '.';
 import { UmbModalLayoutElement } from '@umbraco-cms/modal';
+import { UmbDocumentPickerModalData } from '.';
 import type { UmbTreeElement } from 'src/backoffice/shared/components/tree/tree.element';
 
 // TODO: make use of UmbPickerLayoutBase
@@ -67,7 +67,7 @@ export class UmbDocumentPickerModalElement extends UmbModalLayoutElement<UmbDocu
 	}
 
 	private _close() {
-		this.modalHandler?.submit();
+		this.modalHandler?.close();
 	}
 
 	render() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts
index 2a179487e3..62092d98b0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts
@@ -66,7 +66,7 @@ export class UmbMediaPickerModalElement extends UmbModalLayoutElement<UmbMediaPi
 	}
 
 	private _close() {
-		this.modalHandler?.submit();
+		this.modalHandler?.close();
 	}
 
 	render() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts
index 1f75fae3cc..fc5fc5bcf1 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts
@@ -38,7 +38,7 @@ export class UmbModalLayoutFieldsViewerElement extends UmbModalLayoutElement<Sea
 	];
 
 	private _handleClose() {
-		this.modalHandler?.submit();
+		this.modalHandler?.close();
 	}
 
 	render() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/debug-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/debug-modal.element.ts
index 8c89ab0f5f..6e26495045 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/debug-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/debug-modal.element.ts
@@ -55,7 +55,7 @@ export default class UmbContextDebuggerModalElement extends UmbModalLayoutElemen
 	];
 
 	private _handleClose() {
-		this.modalHandler?.submit();
+		this.modalHandler?.close();
 	}
 
 	render() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts
index ebfffc840f..239d52fbf2 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts
@@ -134,7 +134,7 @@ export class UmbIconPickerModalElement extends UmbModalLayoutElement<UmbIconPick
 	}
 
 	private _close() {
-		this.modalHandler?.submit();
+		this.modalHandler?.close();
 	}
 
 	private _save() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.element.ts
index ba87b32003..97b0c59312 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.element.ts
@@ -109,7 +109,7 @@ export class UmbLinkPickerModalElement extends UmbModalLayoutElement<UmbLinkPick
 	}
 
 	private _close() {
-		this.modalHandler?.submit();
+		this.modalHandler?.close();
 	}
 
 	render() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/property-settings/property-settings-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/property-settings/property-settings-modal.element.ts
index ecf4f0b326..e05d3165c3 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/property-settings/property-settings-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/property-settings/property-settings-modal.element.ts
@@ -183,7 +183,7 @@ export class UmbPropertySettingsModalElement extends UmbModalLayoutElement {
 	}
 
 	#onClose() {
-		this.modalHandler?.submit();
+		this.modalHandler?.close();
 	}
 
 	#onSubmit(event: SubmitEvent) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/create/create-dictionary-modal-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/create/create-dictionary-modal-layout.element.ts
index 3a828d6dd0..f88b95151a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/create/create-dictionary-modal-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/create/create-dictionary-modal-layout.element.ts
@@ -32,7 +32,7 @@ export class UmbCreateDictionaryModalLayoutElement extends UmbModalLayoutElement
 	}
 
 	#handleCancel() {
-		this.modalHandler?.submit({});
+		this.modalHandler?.close();
 	}
 
 	#submitForm() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export-dictionary-modal-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export-dictionary-modal-layout.element.ts
index 1d3bd2e916..b5449903ec 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export-dictionary-modal-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export-dictionary-modal-layout.element.ts
@@ -19,7 +19,7 @@ export class UmbExportDictionaryModalLayoutElement extends UmbModalLayoutElement
 	private _form!: HTMLFormElement;
 
 	#handleClose() {
-		this.modalHandler?.submit({});
+		this.modalHandler?.close();
 	}
 
 	#submitForm() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts
index dfdd2d1343..ee9e7ab1fc 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts
@@ -58,7 +58,7 @@ export class UmbImportDictionaryModalLayoutElement extends UmbModalLayoutElement
 	}
 
 	#handleClose() {
-		this.modalHandler?.submit({});
+		this.modalHandler?.close();
 	}
 
 	#submitForm() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/create-user/create-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/create-user/create-user-modal.element.ts
index 07fa5f5e73..7c4df99f33 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/create-user/create-user-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/create-user/create-user-modal.element.ts
@@ -115,7 +115,7 @@ export class UmbCreateUserModalElement extends UmbModalLayoutElement {
 	}
 
 	private _closeModal() {
-		this.modalHandler?.submit();
+		this.modalHandler?.close();
 	}
 
 	private _resetForm() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/invite-user/invite-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/invite-user/invite-user-modal.element.ts
index a5b4857135..960d274a29 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/invite-user/invite-user-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/invite-user/invite-user-modal.element.ts
@@ -94,7 +94,7 @@ export class UmbInviteUserModalElement extends UmbModalLayoutElement {
 	}
 
 	private _closeModal() {
-		this.modalHandler?.submit();
+		this.modalHandler?.close();
 	}
 
 	private _resetForm() {