diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts
index 827ead0d6b..57719a349c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts
@@ -1,40 +1,66 @@
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, CSSResultGroup, html, repeat, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import {
-	UmbModalContext,
 	UmbModalManagerContext,
 	UMB_MODAL_MANAGER_CONTEXT_TOKEN,
+	UmbModalElement,
+	UmbModalContext,
 } from '@umbraco-cms/backoffice/modal';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 @customElement('umb-backoffice-modal-container')
 export class UmbBackofficeModalContainerElement extends UmbLitElement {
 	@state()
-	private _modals?: UmbModalContext[];
+	private _modalElementMap: Map<string, UmbModalElement> = new Map();
 
-	private _modalContext?: UmbModalManagerContext;
+	@state()
+	_modalHandlers: Array<UmbModalContext> = [];
+
+	private _modalManagerContext?: UmbModalManagerContext;
 
 	constructor() {
 		super();
 
 		this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
-			this._modalContext = instance;
+			this._modalManagerContext = instance;
 			this._observeModals();
 		});
 	}
 
 	private _observeModals() {
-		if (!this._modalContext) return;
+		if (!this._modalManagerContext) return;
+		this.observe(this._modalManagerContext.modals, (modalHandlers) => this.#createModalElements(modalHandlers));
+	}
 
-		this.observe(this._modalContext.modals, (modals) => {
-			this._modals = modals;
+	/** We cannot render the umb-modal element directly in the uui-modal-container because it wont get reconised by UUI.
+	 * We therefore have a helper class which creates the uui-modal element and returns it. */
+	#createModalElements(modalHandlers: Array<UmbModalContext>) {
+		this._modalHandlers = modalHandlers;
+
+		if (this._modalHandlers.length === 0) {
+			this._modalElementMap.clear();
+			return;
+		}
+
+		this._modalHandlers.forEach((modalHandler) => {
+			if (this._modalElementMap.has(modalHandler.key)) return;
+
+			const modalElement = new UmbModalElement();
+			modalElement.modalHandler = modalHandler;
+
+			this._modalElementMap.set(modalHandler.key, modalElement);
 		});
 	}
 
 	render() {
 		return html`
 			<uui-modal-container>
-				${this._modals ? repeat(this._modals, (modalContext) => html`${modalContext.modalElement}`) : ''}
+				${this._modalHandlers.length > 0
+					? repeat(
+							this._modalHandlers,
+							(modalHandler) => html`${this._modalElementMap.get(modalHandler.key)?.modalElement}`,
+					  )
+					: ''}
 			</uui-modal-container>
 		`;
 	}