diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/manifests.ts
deleted file mode 100644
index 11673b9e78..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/manifests.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { manifests as repositoryManifests } from './repository/manifests.js';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
-
-const modals: Array<ManifestModal> = [
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.CultureAndHostnames',
-		name: 'Culture And Hostnames Modal',
-		js: () => import('./modal/culture-and-hostnames-modal.element.js'),
-	},
-];
-
-export const manifests = [...modals, ...repositoryManifests];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
index 06a93cac69..40c0dd6b4e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
@@ -1,7 +1,7 @@
 import { UMB_DOCUMENT_REPOSITORY_ALIAS } from '../../repository/manifests.js';
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js';
 import { UmbDocumentCultureAndHostnamesEntityAction } from './culture-and-hostnames.action.js';
-import { ManifestEntityAction } from '@umbraco-cms/backoffice/extension-registry';
+import { ManifestEntityAction, ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
 
 const entityActions: Array<ManifestEntityAction> = [
 	{
@@ -19,4 +19,13 @@ const entityActions: Array<ManifestEntityAction> = [
 	},
 ];
 
-export const manifests = [...entityActions];
+const manifestModals: Array<ManifestModal> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.CultureAndHostnames',
+		name: 'Culture And Hostnames Modal',
+		js: () => import('./modal/culture-and-hostnames-modal.element.js'),
+	},
+];
+
+export const manifests = [...entityActions, ...manifestModals];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
index 7b231d0f7b..c656517820 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
@@ -1,6 +1,11 @@
 import { html, customElement, state, css, repeat, query } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
+import {
+	UMB_CONFIRM_MODAL,
+	UMB_MODAL_MANAGER_CONTEXT,
+	UmbModalBaseElement,
+	UmbModalManagerContext,
+} from '@umbraco-cms/backoffice/modal';
 import { UUIInputEvent, UUIPopoverContainerElement, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UmbLanguageRepository } from '@umbraco-cms/backoffice/language';
 import { DomainPresentationModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
@@ -87,7 +92,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 		this._domains = this._domains.map((domain, i) => (index === i ? { ...domain, domainName } : domain));
 	}
 
-	#onRemoveDomain(index: number) {
+	async #onRemoveDomain(index: number) {
 		this._domains = this._domains.filter((d, i) => index !== i);
 	}
 
@@ -175,7 +180,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 						look="outline"
 						color="danger"
 						label=${this.localize.term('assignDomain_remove')}
-						@change=${() => this.#onRemoveDomain(index)}>
+						@click=${() => this.#onRemoveDomain(index)}>
 						<uui-icon name="icon-trash"></uui-icon>
 					</uui-button>
 				`,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/index.ts
new file mode 100644
index 0000000000..a25927e33b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/index.ts
@@ -0,0 +1 @@
+export * from './culture-and-hostnames/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
index 1afab25c2e..50f3d55158 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
@@ -7,7 +7,7 @@ export * from './recycle-bin/index.js';
 export * from './user-permissions/index.js';
 export * from './components/index.js';
 export * from './entity.js';
-export * from './culture-and-hostnames/index.js';
+export * from './entity-actions/index.js';
 
 export { UMB_DOCUMENT_TREE_ALIAS } from './tree/index.js';
 export { UMB_CONTENT_MENU_ALIAS } from './menu.manifests.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
index 82edf90e04..ba7ad261ff 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
@@ -9,7 +9,6 @@ import { manifests as propertyEditorManifests } from './property-editors/manifes
 import { manifests as userPermissionManifests } from './user-permissions/manifests.js';
 import { manifests as recycleBinManifests } from './recycle-bin/manifests.js';
 import { manifests as trackedReferenceManifests } from './tracked-reference/manifests.js';
-import { manifests as cultureAndHostnamesManifests } from './culture-and-hostnames/manifests.js';
 
 export const manifests = [
 	...collectionManifests,
@@ -23,5 +22,4 @@ export const manifests = [
 	...userPermissionManifests,
 	...recycleBinManifests,
 	...trackedReferenceManifests,
-	...cultureAndHostnamesManifests,
 ];