diff --git a/src/Umbraco.Web.UI.Client/libs/modal/elements/modal-element-picker-base.ts b/src/Umbraco.Web.UI.Client/libs/modal/elements/modal-element-picker-base.ts
index 928976f163..0e1c8c1a5f 100644
--- a/src/Umbraco.Web.UI.Client/libs/modal/elements/modal-element-picker-base.ts
+++ b/src/Umbraco.Web.UI.Client/libs/modal/elements/modal-element-picker-base.ts
@@ -24,7 +24,7 @@ export class UmbModalElementPickerBase<T> extends UmbModalLayoutElement<UmbPicke
 	}
 
 	close() {
-		this.modalHandler?.close();
+		this.modalHandler?.reject();
 	}
 
 	protected _handleKeydown(e: KeyboardEvent, key: string) {
diff --git a/src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts b/src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts
index 084657305a..a05df64a7f 100644
--- a/src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts
+++ b/src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts
@@ -12,10 +12,9 @@ import { ManifestModal } from '@umbraco-cms/extensions-registry';
 
 //TODO consider splitting this into two separate handlers
 export class UmbModalHandler {
-	private _submitResolver: any;
 	private _submitPromise: any;
-	private _closeResolver: any;
-	private _closePromise: any;
+	private _submitResolver: any;
+	private _submitRejecter: any;
 	#host: UmbControllerHostInterface;
 
 	public modalElement: UUIModalDialogElement | UUIModalSidebarElement;
@@ -47,11 +46,9 @@ export class UmbModalHandler {
 		this.size = config?.size || this.size;
 
 		// TODO: Consider if its right to use Promises, or use another event based system? Would we need to be able to cancel an event, to then prevent the closing..?
-		this._submitPromise = new Promise((resolve) => {
+		this._submitPromise = new Promise((resolve, reject) => {
 			this._submitResolver = resolve;
-		});
-		this._closePromise = new Promise((resolve) => {
-			this._closeResolver = resolve;
+			this._submitRejecter = reject;
 		});
 
 		this.modalElement = this.#createContainerElement();
@@ -95,17 +92,14 @@ export class UmbModalHandler {
 		this.modalElement.close();
 	}
 
-	public close() {
-		this._closeResolver();
+	public reject() {
+		this._submitRejecter();
 		this.modalElement.close();
 	}
 
 	public onSubmit(): Promise<any> {
 		return this._submitPromise;
 	}
-	public onClose(): Promise<any> {
-		return this._closePromise;
-	}
 
 	/* TODO: modals being part of the extension registry now means that a modal element can change over time.
 	 It makes this code a bit more complex. The main idea is to have the element as part of the modalHandler so it is possible to dispatch events from within the modal element to the one that opened it.
diff --git a/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts b/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts
index 0e6cf62954..54625e1d51 100644
--- a/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts
+++ b/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts
@@ -91,7 +91,7 @@ export class UmbModalContext {
 	public close(key: string) {
 		const modal = this.#modals.getValue().find((modal) => modal.key === key);
 		if (modal) {
-			modal.close();
+			modal.reject();
 		}
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/libs/modal/stories/modal.mdx b/src/Umbraco.Web.UI.Client/libs/modal/stories/modal.mdx
index ed0aae3113..69baf76f73 100644
--- a/src/Umbraco.Web.UI.Client/libs/modal/stories/modal.mdx
+++ b/src/Umbraco.Web.UI.Client/libs/modal/stories/modal.mdx
@@ -64,8 +64,8 @@ class MyElement extends UmbElementMixin(LitElement) {
 		const options {'options go here'};
 		const modalHandler = this.#modalContext?.open(SOME_MODAL_TOKEN), data, options);
 
-		modalHandler?.onClose().then((data) => {
-			// if any data is supplied on close, it will be available here.
+		modalHandler?.onSubmit().then((data) => {
+			// if modal submitted, then data is supplied here.
 		});
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/entity-actions/create/create-document-modal-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/entity-actions/create/create-document-modal-layout.element.ts
index 4ba9aa6b4e..de2fda08f9 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/entity-actions/create/create-document-modal-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/entity-actions/create/create-document-modal-layout.element.ts
@@ -16,7 +16,7 @@ export class UmbCreateDocumentModalLayoutElement extends UmbModalLayoutElement<U
 	static styles = [UUITextStyles];
 
 	private _handleCancel() {
-		this.modalHandler?.close();
+		this.modalHandler?.reject();
 	}
 
 	#onClick(event: PointerEvent) {
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 5ad4c67c93..9ff9ccae7b 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
@@ -67,7 +67,7 @@ export class UmbDocumentPickerModalElement extends UmbModalLayoutElement<UmbDocu
 	}
 
 	private _close() {
-		this.modalHandler?.close();
+		this.modalHandler?.reject();
 	}
 
 	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 62092d98b0..4f9e7b9ec7 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?.close();
+		this.modalHandler?.reject();
 	}
 
 	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 a281710c8d..ef8c0c5c04 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 UmbModalElementFieldsViewerElement extends UmbModalLayoutElement<Se
 	];
 
 	private _handleClose() {
-		this.modalHandler?.close();
+		this.modalHandler?.reject();
 	}
 
 	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 6e26495045..e1bfa1400a 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?.close();
+		this.modalHandler?.reject();
 	}
 
 	render() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/confirm/confirm-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/confirm/confirm-modal.element.ts
index 7067f0a619..3403ed532a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/confirm/confirm-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/confirm/confirm-modal.element.ts
@@ -13,7 +13,7 @@ export class UmbConfirmModalElement extends UmbModalLayoutElement<UmbConfirmModa
 	}
 
 	private _handleCancel() {
-		this.modalHandler?.close();
+		this.modalHandler?.reject();
 	}
 
 	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 239d52fbf2..274056da96 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?.close();
+		this.modalHandler?.reject();
 	}
 
 	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 97b0c59312..b9d02dd700 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?.close();
+		this.modalHandler?.reject();
 	}
 
 	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 e05d3165c3..845a2621e1 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?.close();
+		this.modalHandler?.reject();
 	}
 
 	#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 f88b95151a..45074f8f2f 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?.close();
+		this.modalHandler?.reject();
 	}
 
 	#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 b5449903ec..97ef1e5537 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?.close();
+		this.modalHandler?.reject();
 	}
 
 	#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 ee9e7ab1fc..230adc34f3 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?.close();
+		this.modalHandler?.reject();
 	}
 
 	#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 7c4df99f33..415221d64f 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?.close();
+		this.modalHandler?.reject();
 	}
 
 	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 960d274a29..8858df7b36 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?.close();
+		this.modalHandler?.reject();
 	}
 
 	private _resetForm() {