diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/create.action.ts
index ae915e9036..7c68955275 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/create.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/create.action.ts
@@ -8,7 +8,7 @@ export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDataTy
 		if (!this.repository) throw new Error('Repository is not available');
 
 		const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-		modalManager.open(this, UMB_DATA_TYPE_CREATE_OPTIONS_MODAL, {
+		const modalContext = modalManager.open(this, UMB_DATA_TYPE_CREATE_OPTIONS_MODAL, {
 			data: {
 				parent: {
 					entityType: this.entityType,
@@ -16,5 +16,7 @@ export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDataTy
 				},
 			},
 		});
+
+		await modalContext.onSubmit();
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/create.action.ts
index 98620d001b..b01206f516 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/create.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/create.action.ts
@@ -8,7 +8,7 @@ export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDocume
 		if (!this.repository) throw new Error('Repository is not available');
 
 		const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-		modalManager.open(this, UMB_DOCUMENT_TYPE_CREATE_OPTIONS_MODAL, {
+		const modalContext = modalManager.open(this, UMB_DOCUMENT_TYPE_CREATE_OPTIONS_MODAL, {
 			data: {
 				parent: {
 					unique: this.unique,
@@ -16,5 +16,7 @@ export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDocume
 				},
 			},
 		});
+
+		await modalContext.onSubmit();
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts
index feb7cf4651..d8c834e3e6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts
@@ -36,7 +36,7 @@ export class UmbDataTypeCreateOptionsModalElement extends UmbModalBaseElement<Um
 
 	// close the modal when navigating to data type
 	#onNavigate() {
-		this._rejectModal();
+		this._submitModal();
 	}
 
 	#getCreateHref() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts
index 5112f42ab0..78343f888c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts
@@ -28,11 +28,13 @@ export class UmbCreateDocumentEntityAction extends UmbEntityActionBase<UmbDocume
 		}
 
 		const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-		modalManager.open(this, UMB_DOCUMENT_CREATE_OPTIONS_MODAL, {
+		const modalContext = modalManager.open(this, UMB_DOCUMENT_CREATE_OPTIONS_MODAL, {
 			data: {
 				document: documentItem ? { unique: documentItem.unique } : null,
 				documentType: documentItem ? { unique: documentItem.documentType.unique } : null,
 			},
 		});
+
+		await modalContext.onSubmit();
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts
index 530f2065af..0d0a00268f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts
@@ -8,7 +8,7 @@ export class UmbCreateMediaTypeEntityAction extends UmbEntityActionBase<UmbMedia
 		if (!this.repository) throw new Error('Repository is not available');
 
 		const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-		modalManager.open(this, UMB_MEDIA_TYPE_CREATE_OPTIONS_MODAL, {
+		const modalContext = modalManager.open(this, UMB_MEDIA_TYPE_CREATE_OPTIONS_MODAL, {
 			data: {
 				parent: {
 					unique: this.unique,
@@ -16,5 +16,7 @@ export class UmbCreateMediaTypeEntityAction extends UmbEntityActionBase<UmbMedia
 				},
 			},
 		});
+
+		await modalContext.onSubmit();
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts
index 33a0946f2a..307604d558 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts
@@ -38,8 +38,10 @@ export class UmbCreateMediaEntityAction extends UmbEntityActionBase<UmbMediaDeta
 
 	private async _openModal(modalData: UmbMediaCreateOptionsModalData) {
 		const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-		modalManager.open(this, UMB_MEDIA_CREATE_OPTIONS_MODAL, {
+		const modalContext = modalManager.open(this, UMB_MEDIA_CREATE_OPTIONS_MODAL, {
 			data: modalData,
 		});
+
+		await modalContext.onSubmit();
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/create.action.ts
index 1a55f216c8..507de94bd1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/create.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/create.action.ts
@@ -7,7 +7,7 @@ export class UmbScriptCreateOptionsEntityAction extends UmbEntityActionBase<neve
 		if (!this.repository) throw new Error('Repository is not available');
 
 		const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-		modalManager.open(this, UMB_SCRIPT_CREATE_OPTIONS_MODAL, {
+		const modalContext = modalManager.open(this, UMB_SCRIPT_CREATE_OPTIONS_MODAL, {
 			data: {
 				parent: {
 					entityType: this.entityType,
@@ -15,5 +15,7 @@ export class UmbScriptCreateOptionsEntityAction extends UmbEntityActionBase<neve
 				},
 			},
 		});
+
+		await modalContext.onSubmit();
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/create/create.action.ts
index cc7f6adc69..d048a9e836 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/create/create.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/create/create.action.ts
@@ -7,7 +7,7 @@ export class UmbStylesheetCreateOptionsEntityAction extends UmbEntityActionBase<
 		if (!this.repository) throw new Error('Repository is not available');
 
 		const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-		modalManager.open(this, UMB_STYLESHEET_CREATE_OPTIONS_MODAL, {
+		const modalContext = modalManager.open(this, UMB_STYLESHEET_CREATE_OPTIONS_MODAL, {
 			data: {
 				parent: {
 					unique: this.unique,
@@ -15,5 +15,7 @@ export class UmbStylesheetCreateOptionsEntityAction extends UmbEntityActionBase<
 				},
 			},
 		});
+
+		await modalContext.onSubmit();
 	}
 }