diff --git a/packages/base/src/css/OpenUI5PopupStyles.css b/packages/base/src/css/OpenUI5PopupStyles.css
index 49dad81fd254..d523159cf4fd 100644
--- a/packages/base/src/css/OpenUI5PopupStyles.css
+++ b/packages/base/src/css/OpenUI5PopupStyles.css
@@ -2,4 +2,9 @@
 	border: none;
 	overflow: visible;
 	margin: 0;
+}
+
+.sapUiBLy[popover] {
+	width: 100%;
+	height: 100%;
 }
\ No newline at end of file
diff --git a/packages/base/src/features/OpenUI5Support.ts b/packages/base/src/features/OpenUI5Support.ts
index 6ad44830cdcb..8bf7827e5082 100644
--- a/packages/base/src/features/OpenUI5Support.ts
+++ b/packages/base/src/features/OpenUI5Support.ts
@@ -6,7 +6,7 @@ import {
 	removeOpenedPopup,
 	getTopmostPopup,
 } from "./patchPopup.js";
-import type { OpenUI5Popup, OpenUI5PopupBasedControl, PopupInfo } from "./patchPopup.js";
+import type { OpenUI5PopupClass, OpenUI5DialogClass, PopupInfo } from "./patchPopup.js";
 import { registerFeature } from "../FeaturesRegistry.js";
 import { setTheme } from "../config/Theme.js";
 import type { CLDRData } from "../asset-registries/LocaleData.js";
@@ -110,7 +110,7 @@ class OpenUI5Support {
 								"sap/ui/core/date/CalendarUtils",
 							];
 						}
-						window.sap.ui.require(deps, (Popup: OpenUI5Popup, Dialog: OpenUI5PopupBasedControl, Patcher: OpenUI5Patcher) => {
+						window.sap.ui.require(deps, (Popup: OpenUI5PopupClass, Dialog: OpenUI5DialogClass, Patcher: OpenUI5Patcher) => {
 							patchPatcher(Patcher);
 							patchPopup(Popup, Dialog);
 							resolve();
diff --git a/packages/base/src/features/patchPopup.ts b/packages/base/src/features/patchPopup.ts
index a5e6fafadf68..cac58ca5dff1 100644
--- a/packages/base/src/features/patchPopup.ts
+++ b/packages/base/src/features/patchPopup.ts
@@ -8,16 +8,19 @@ type Control = {
 
 // The lifecycle of Popup.js is open -> _opened -> close -> _closed, we're interested in the first (open) and last (_closed)
 type OpenUI5Popup = {
-	prototype: {
-		open: (...args: any[]) => void,
-		_closed: (...args: any[]) => void,
-		getOpenState: () => "CLOSED" | "CLOSING" | "OPEN" | "OPENING",
-		getContent: () => Control | HTMLElement | null, // this is the OpenUI5 Element/Control instance that opens the Popup (usually sap.m.Popover/sap.m.Dialog)
-		onFocusEvent: (...args: any[]) => void,
-	}
+	open: (...args: any[]) => void,
+	_closed: (...args: any[]) => void,
+	getOpenState: () => "CLOSED" | "CLOSING" | "OPEN" | "OPENING",
+	getContent: () => Control | HTMLElement | null, // this is the OpenUI5 Element/Control instance that opens the Popup (usually sap.m.Popover/sap.m.Dialog)
+	onFocusEvent: (...args: any[]) => void,
+	getModal: () => boolean
 };
 
-type OpenUI5PopupBasedControl = {
+type OpenUI5PopupClass = {
+	prototype: OpenUI5Popup
+};
+
+type OpenUI5DialogClass = {
 	prototype: {
 		onsapescape: (...args: any[]) => void,
 		oPopup: OpenUI5Popup,
@@ -25,8 +28,11 @@ type OpenUI5PopupBasedControl = {
 };
 
 type PopupInfo = {
-	type: "OpenUI5" | "WebComponent";
+	type: "WebComponent";
 	instance: object;
+} | {
+	type: "OpenUI5";
+	instance: OpenUI5Popup;
 };
 
 // contains all OpenUI5 and Web Component popups that are currently opened
@@ -38,6 +44,11 @@ const addOpenedPopup = (popupInfo: PopupInfo) => {
 
 const removeOpenedPopup = (popup: object) => {
 	const index = AllOpenedPopupsRegistry.openedRegistry.findIndex(el => el.instance === popup);
+
+	if (index === AllOpenedPopupsRegistry.openedRegistry.length - 1) {
+		fixTopmostOpenUI5Popup();
+	}
+
 	if (index > -1) {
 		AllOpenedPopupsRegistry.openedRegistry.splice(index, 1);
 	}
@@ -68,16 +79,83 @@ const hasWebComponentPopupAbove = (popup: object) => {
 	return false;
 };
 
-const openNativePopover = (domRef: HTMLElement) => {
+const getPopupContentElement = (popup: OpenUI5Popup): HTMLElement | null => {
+	const content = popup.getContent()!;
+	return content instanceof HTMLElement ? content : content?.getDomRef() || null;
+};
+
+const openNativePopoverForOpenUI5 = (popup: OpenUI5Popup) => {
+	const openingInitiated = ["OPENING", "OPEN"].includes(popup.getOpenState());
+	if (!openingInitiated || !isNativePopoverOpen()) {
+		return;
+	}
+
+	const domRef = getPopupContentElement(popup);
+
+	if (!domRef) {
+		return;
+	}
+
+	const openUI5BlockLayer = document.getElementById("sap-ui-blocklayer-popup");
+
+	if (popup.getModal() && openUI5BlockLayer) {
+		openUI5BlockLayer.setAttribute("popover", "manual");
+		openUI5BlockLayer.hidePopover();
+		openUI5BlockLayer.showPopover();
+	}
+
 	domRef.setAttribute("popover", "manual");
 	domRef.showPopover();
 };
 
-const closeNativePopover = (domRef: HTMLElement) => {
+const closeNativePopoverForOpenUI5 = (popup: OpenUI5Popup) => {
+	const domRef = getPopupContentElement(popup);
+
+	if (!domRef) {
+		return;
+	}
+
 	if (domRef.hasAttribute("popover")) {
 		domRef.hidePopover();
 		domRef.removeAttribute("popover");
 	}
+
+	if (getTopmostPopup() !== popup) {
+		return;
+	}
+
+	// The OpenUI5 block layer is only one for all modal OpenUI5 popups,
+	// and it is displayed above all opened pupups - OpenUI5 and Web Components,
+	// as a result, we need to hide this block layer.
+	// If the underlying popup is a Web Component - it is displayed like a native popover, and we don't need to do anything
+	// If the underlying popup is an OpenUI5 popup, it will be fixed in fixTopmostOpenUI5Popup method.
+	if (popup.getModal()) {
+		const openUI5BlockLayer = document.getElementById("sap-ui-blocklayer-popup");
+		if (openUI5BlockLayer && openUI5BlockLayer.hasAttribute("popover")) {
+			openUI5BlockLayer.hidePopover();
+		}
+	}
+};
+
+const fixTopmostOpenUI5Popup = () => {
+	if (!isNativePopoverOpen()) {
+		return;
+	}
+
+	const prevPopup = AllOpenedPopupsRegistry.openedRegistry[AllOpenedPopupsRegistry.openedRegistry.length - 2];
+	if (!prevPopup
+		|| prevPopup.type !== "OpenUI5"
+		|| !prevPopup.instance.getModal()) {
+		return;
+	}
+
+	const content = getPopupContentElement(prevPopup.instance);
+	const openUI5BlockLayer = document.getElementById("sap-ui-blocklayer-popup");
+
+	content?.hidePopover();
+	openUI5BlockLayer?.showPopover();
+
+	content?.showPopover();
 };
 
 const isNativePopoverOpen = (root: Document | ShadowRoot = document): boolean => {
@@ -91,9 +169,9 @@ const isNativePopoverOpen = (root: Document | ShadowRoot = document): boolean =>
 	});
 };
 
-const patchPopupBasedControl = (PopupBasedControl: OpenUI5PopupBasedControl) => {
-	const origOnsapescape = PopupBasedControl.prototype.onsapescape;
-	PopupBasedControl.prototype.onsapescape = function onsapescape(...args: any[]) {
+const patchDialog = (Dialog: OpenUI5DialogClass) => {
+	const origOnsapescape = Dialog.prototype.onsapescape;
+	Dialog.prototype.onsapescape = function onsapescape(...args: any[]) {
 		if (hasWebComponentPopupAbove(this.oPopup)) {
 			return;
 		}
@@ -102,21 +180,11 @@ const patchPopupBasedControl = (PopupBasedControl: OpenUI5PopupBasedControl) =>
 	};
 };
 
-const patchOpen = (Popup: OpenUI5Popup) => {
+const patchOpen = (Popup: OpenUI5PopupClass) => {
 	const origOpen = Popup.prototype.open;
 	Popup.prototype.open = function open(...args: any[]) {
 		origOpen.apply(this, args); // call open first to initiate opening
-		const topLayerAlreadyInUse = isNativePopoverOpen();
-		const openingInitiated = ["OPENING", "OPEN"].includes(this.getOpenState());
-		if (openingInitiated && topLayerAlreadyInUse) {
-			const element = this.getContent();
-			if (element) {
-				const domRef = element instanceof HTMLElement ? element : element?.getDomRef();
-				if (domRef) {
-					openNativePopover(domRef);
-				}
-			}
-		}
+		openNativePopoverForOpenUI5(this);
 
 		addOpenedPopup({
 			type: "OpenUI5",
@@ -125,21 +193,16 @@ const patchOpen = (Popup: OpenUI5Popup) => {
 	};
 };
 
-const patchClosed = (Popup: OpenUI5Popup) => {
+const patchClosed = (Popup: OpenUI5PopupClass) => {
 	const _origClosed = Popup.prototype._closed;
 	Popup.prototype._closed = function _closed(...args: any[]) {
-		const element = this.getContent();
-		const domRef = element instanceof HTMLElement ? element : element?.getDomRef();
+		closeNativePopoverForOpenUI5(this);
 		_origClosed.apply(this, args); // only then call _close
-		if (domRef) {
-			closeNativePopover(domRef); // unset the popover attribute and close the native popover, but only if still in DOM
-		}
-
 		removeOpenedPopup(this);
 	};
 };
 
-const patchFocusEvent = (Popup: OpenUI5Popup) => {
+const patchFocusEvent = (Popup: OpenUI5PopupClass) => {
 	const origFocusEvent = Popup.prototype.onFocusEvent;
 	Popup.prototype.onFocusEvent = function onFocusEvent(...args: any[]) {
 		if (!hasWebComponentPopupAbove(this)) {
@@ -154,13 +217,13 @@ const createGlobalStyles = () => {
 	document.adoptedStyleSheets = [...document.adoptedStyleSheets, stylesheet];
 };
 
-const patchPopup = (Popup: OpenUI5Popup, Dialog: OpenUI5PopupBasedControl) => {
+const patchPopup = (Popup: OpenUI5PopupClass, Dialog: OpenUI5DialogClass) => {
 	insertOpenUI5PopupStyles();
 	patchOpen(Popup); // Popup.prototype.open
 	patchClosed(Popup); // Popup.prototype._closed
 	createGlobalStyles(); // Ensures correct popover positioning by OpenUI5 (otherwise 0,0 is the center of the screen)
 	patchFocusEvent(Popup);// Popup.prototype.onFocusEvent
-	patchPopupBasedControl(Dialog); // Dialog.prototype.onsapescape
+	patchDialog(Dialog); // Dialog.prototype.onsapescape
 };
 
 export {
@@ -170,4 +233,4 @@ export {
 	getTopmostPopup,
 };
 
-export type { OpenUI5Popup, OpenUI5PopupBasedControl, PopupInfo };
+export type { OpenUI5PopupClass, OpenUI5DialogClass, PopupInfo };
diff --git a/packages/main/cypress/specs/OpenUI5andWebCPopups.cy.tsx b/packages/main/cypress/specs/OpenUI5andWebCPopups.cy.tsx
index f11c71d574f2..b5e62f6e546c 100644
--- a/packages/main/cypress/specs/OpenUI5andWebCPopups.cy.tsx
+++ b/packages/main/cypress/specs/OpenUI5andWebCPopups.cy.tsx
@@ -17,6 +17,7 @@ function onOpenUI5InitMethod(win) {
 			press: function () {
 				new Dialog("openUI5Dialog1", {
 					title: "OpenUI5 Dialog",
+					draggable: true,
 					content: [
 						new HTML({
 							content:
@@ -49,6 +50,12 @@ function onOpenUI5InitMethod(win) {
 							press: function () {
 								(document.getElementById("respPopoverNoInitialFocus") as any).open = true;
 							}
+						}),
+						new Button("openWebCDialog", {
+							text: "Open WebC Dialog",
+							press: function () {
+								(document.getElementById("webCDialog1") as any).open = true;
+							}
 						})
 					],
 					afterClose: function () {
@@ -112,6 +119,10 @@ function onOpenUI5InitMethod(win) {
 		openUI5Dialog(win);
 	});
 
+	document.getElementById("openUI5DialogFromWebC").addEventListener("click", function () {
+		openUI5Dialog(win);
+	});
+
 	document.getElementById("popoverButtonNoFocus").addEventListener("click", function (event) {
 		openUI5Popover(win, event.target);
 	});
@@ -121,6 +132,7 @@ function openUI5Dialog(win) {
 	(win as any).sap.ui.require(["sap/m/Button", "sap/m/Dialog"], (Button, Dialog) => {
 		new Dialog("openUI5DialogWithButtons", {
 			title: "OpenUI5 Dialog",
+			draggable: true,
 			content: [
 				new Button({
 					text: "Focus stop"
@@ -130,6 +142,29 @@ function openUI5Dialog(win) {
 					press: function () {
 						(document.getElementById("newDialog1") as any).open = true;
 					}
+				}),
+				new Button("openUI5DialogFromUi5", {
+					text: "Open UI5 Dialog",
+					press: function () {
+						openUI5DialogFromUi5(win)
+					}
+				})
+			],
+			afterClose: function () {
+				this.destroy();
+			}
+		}).open();
+	});
+}
+
+function openUI5DialogFromUi5(win) {
+	(win as any).sap.ui.require(["sap/m/Button", "sap/m/Dialog"], (Button, Dialog) => {
+		new Dialog("openUI5DialogFinal", {
+			title: "OpenUI5 Dialog",
+			draggable: true,
+			content: [
+				new Button({
+					text: "Focus stop"
 				})
 			],
 			afterClose: function () {
@@ -204,6 +239,9 @@ describe("ui5 and web components integration", () => {
 				<Dialog id="newDialog1" headerText="This is an WebC Dialog 2">
 					<Button id="someButton">Some button</Button>
 				</Dialog>
+				<Dialog id="webCDialog1" draggable headerText="This is a WebC Dialog">
+					<Button id="openUI5DialogFromWebC">Open UI5 Dialog 2</Button>
+				</Dialog>
 				<div id="content"></div>
 				<ResponsivePopover
 					id="respPopover"
@@ -500,7 +538,7 @@ describe("ui5 and web components integration", () => {
 	}
 
 	function OpenUI5DialogWebCPopoverNoFocus() {
-		cy.get("#openUI5Button")
+		cy.get("#openUI5Button", { timeout: 10000 })
 			.should('be.visible')
 			.realClick();
 
@@ -518,6 +556,9 @@ describe("ui5 and web components integration", () => {
 		cy.get("#respPopoverNoInitialFocus")
 			.should('not.be.visible');
 
+		cy.get("#openResPopoverNoInitialFocusButton")
+			.should('be.focused');
+
 		cy.get("#openUI5Dialog1")
 			.should('be.visible');
 
@@ -526,13 +567,13 @@ describe("ui5 and web components integration", () => {
 		cy.get("#openUI5Dialog1")
 			.should('not.be.visible');
 
-		cy.get("#openResPopoverNoInitialFocusButton")
+		cy.get("#openUI5Button")
 			.should('be.focused');
 	}
 
 	function OpenUI5DialogWebCSelect() {
-		cy.get("#openUI5Button")
-			.should('be.focused')
+		cy.get("#openUI5Button", { timeout: 10000 })
+			.should('be.visible')
 			.realClick();
 
 		cy.get("#openUI5Dialog1")
@@ -605,6 +646,87 @@ describe("ui5 and web components integration", () => {
 			.should('be.focused');
 	}
 
+	function OpenWebCUI5DialogMixed() {
+		cy.get("#openUI5Button", { timeout: 10000 })
+			.should('be.visible');
+
+		// Open UI5 Dialog
+		cy.get("#openUI5Button")
+			.realClick();
+
+		cy.get("#openUI5Dialog1")
+			.should('be.visible');
+
+		// Open WebC Dialog from UI5 Dialog
+		cy.get("#openWebCDialog")
+			.should('be.visible')
+			.realClick();
+
+		cy.get("#webCDialog1")
+			.should('be.visible');
+
+		cy.get("#openUI5Dialog1")
+			.should('not.be.visible');
+
+		// Open UI5 Dialog from WebC Dialog
+		cy.get("#openUI5DialogFromWebC")
+			.should('be.visible')
+			.realClick();
+
+		cy.get("#webCDialog1")
+			.should('not.be.visible');
+
+		cy.get("#openUI5Dialog1")
+			.should('not.be.visible');
+
+		cy.get("#openUI5DialogWithButtons")
+			.should('be.visible');
+
+		// Open UI5 Dialog from UI5 Dialog
+		cy.get("#openUI5DialogFromUi5")
+			.should('be.visible')
+			.realClick();
+
+		cy.get("#openUI5DialogFinal")
+			.should('be.visible');
+
+		cy.get("#openUI5Dialog1")
+			.should('not.be.visible');
+
+		cy.get("#webCDialog1")
+			.should('not.be.visible');
+
+		cy.get("#openUI5DialogWithButtons")
+			.should('not.be.visible');
+
+		// Close all with Escape
+		cy.realPress("Escape");
+
+		cy.get("#openUI5DialogFinal")
+			.should('not.exist');
+
+		cy.get("#openUI5DialogWithButtons")
+			.should('be.visible');
+
+		cy.realPress("Escape");
+
+		cy.get("#openUI5DialogWithButtons")
+			.should('not.exist');
+
+		cy.get("#webCDialog1")
+			.should('be.visible');
+
+		cy.realPress("Escape");
+
+		cy.get("#openUI5Dialog1")
+			.should('be.visible');
+
+		cy.realPress("Escape");
+
+		cy.get("#openWebCDialog")
+			.should('not.exist');
+	}
+
 	it("Keyboard", () => {
 		OpenWebCDialog();
 		OpenWebCDialogOpenOpenUI5Dialog();
@@ -617,7 +739,7 @@ describe("ui5 and web components integration", () => {
 		OpenUI5DialogWebCDialog();
 		OpenUI5DialogWebCPopoverNoFocus();
 		OpenUI5DialogWebCSelect();
-		// Merge it after OpenUI5 Popup shadow dom focus fix is released
-		// OpenUI5DialogWebCComboBox();
+		OpenWebCUI5DialogMixed();
+		OpenUI5DialogWebCComboBox();
 	});
 });
\ No newline at end of file
diff --git a/packages/main/src/popup-utils/OpenedPopupsRegistry.ts b/packages/main/src/popup-utils/OpenedPopupsRegistry.ts
index df330fdb59ea..7d6b4798cb0e 100644
--- a/packages/main/src/popup-utils/OpenedPopupsRegistry.ts
+++ b/packages/main/src/popup-utils/OpenedPopupsRegistry.ts
@@ -72,7 +72,7 @@ const _keydownListener = (event: KeyboardEvent) => {
 			return;
 		}
 
-		event.stopPropagation();
+		event.stopImmediatePropagation();
 		topmostPopup.closePopup(true);
 	}
 };
diff --git a/packages/main/test/pages/DialogAndOpenUI5Dialog.html b/packages/main/test/pages/DialogAndOpenUI5Dialog.html
index 8c118a4f8dd8..f241454d1577 100644
--- a/packages/main/test/pages/DialogAndOpenUI5Dialog.html
+++ b/packages/main/test/pages/DialogAndOpenUI5Dialog.html
@@ -27,6 +27,7 @@
 					press: function () {
 						new Dialog("openUI5Dialog", {
 							title: "OpenUI5 Dialog",
+							draggable: true,
 							content: [
 								new HTML({
 									content:
@@ -62,6 +63,12 @@
 									press: function () {
 										document.getElementById("respPopoverNoInitialFocus").open = true;
 									}
+								}),
+								new Button("openUI5DialogOpener", {
+									text: "Open UI5 Dialog",
+									press: function () {
+										openUI5Dialog2();
+									}
 								})
 							],
 							afterClose: function () {
@@ -112,7 +119,6 @@
 						}
 					}).placeAt("dialog1content");
 
-
 					ShortcutHintsMixin.addConfig(button, {
 						event: "press",
 						position: "0 0",
@@ -128,20 +134,34 @@
 			document.getElementById("popoverButtonNoFocus").addEventListener("click", function (event) {
 				openUI5Popover(event.target);
 			});
+
+			document.getElementById("someButton2").addEventListener("click", function () {
+				openUI5Dialog2();
+			});
+			document.getElementById("someButton3").addEventListener("click", function () {
+				openUI5Dialog3();
+			});
+			document.getElementById("someButton4").addEventListener("click", function () {
+				document.getElementById("newDialog4").open = true;
+			});
+			document.getElementById("openUi5PopoverBlockLayer").addEventListener("click", function () {
+				openUI5Popover(this);
+			});
 		}
 
 		function openUI5Dialog() {
 			sap.ui.require(["sap/m/Button", "sap/m/Dialog"], (Button, Dialog) => {
 				new Dialog("openUI5DialogWithButtons", {
-					title: "OpenUI5 Dialog",
+					title: "UI5 Dialog 1",
+					draggable: true,
 					content: [
 						new Button({
 							text: "Focus stop"
 						}),
 						new Button("openUI5DialogButton", {
-							text: "Open WebC Dialog",
+							text: "Open UI5 Dialog 2",
 							press: function () {
-								document.getElementById("newDialog1").open = true;
+								openUI5Dialog2();
 							}
 						})
 					],
@@ -152,20 +172,121 @@
 			});
 		}
 
+		function openUI5Dialog2() {
+				sap.ui.require(["sap/m/Button", "sap/m/Dialog"], (Button, Dialog) => {
+					new Dialog("openUI5DialogWithButtons2", {
+						title: "UI5 Dialog 2",
+						draggable: true,
+						content: [
+							new Button({
+								text: "Focus stop"
+							}),
+							new Button("openUI5DialogButton2", {
+								text: "Open WebC Dialog 2",
+								press: function () {
+									document.getElementById("newDialog2").open = true;
+								}
+							})
+						],
+						afterClose: function () {
+							this.destroy();
+						}
+					}).open();
+				});
+			}
+
+			function openUI5Dialog3() {
+					sap.ui.require(["sap/m/Button", "sap/m/Dialog"], (Button, Dialog) => {
+						new Dialog("openUI5DialogWithButtons3", {
+							title: "UI5 Dialog 3",
+							draggable: true,
+							content: [
+								new Button({
+									text: "Focus stop"
+								}),
+								new Button("openUI5DialogButton22", {
+									text: "Open WebC Dialog 3",
+									press: function () {
+										document.getElementById("newDialog3").open = true;
+									}
+								})
+							],
+							afterClose: function () {
+								this.destroy();
+							}
+						}).open();
+					});
+				}
+
 		function openUI5Popover(opener) {
 			sap.ui.require(["sap/m/Popover", "sap/m/Button"], (Popover, Button) => {
 				new Popover("openUI5PopoverSecond", {
-					title: "OpenUI5 Popover",
+					title: "OpenUI5 Popover 1",
 					content: [
-						new Button("someButton", {
+						new Button({
+							text: "Open ui5 Dialog",
+							press: function () {
+								openUI5Dialog3();
+							}
+						}),
+						new Button({
+							text: "Open WebC Dialog",
+							press: function () {
+								document.getElementById("newDialog4").open = true;
+							}
+						}),
+						new Button({
 							text: "Open new OpenUI5 Popover",
 							press: function (oEvent) {
-								new Popover({
+								new Popover("openUI5PopoverThird", {
 									title: "New OpenUI5 Popover",
 									placement: "Bottom",
 									content: [
 										new Button({
 											text: "Focus stop"
+										}),
+										new Button({
+											text: "Open Ui5 Dialog",
+											press: function () {
+												openUI5Dialog3();
+											}
+										}),
+										new Button({
+											text: "Open WebC Dialog",
+											press: function () {
+												document.getElementById("newDialog4").open = true;
+											}
+										})
+									],
+									initialFocus: "someButton",
+									afterClose: function () {
+										this.destroy();
+									}
+								}).openBy(oEvent.getSource());
+							}
+						}),
+						new Button({
+							text: "Open new OpenUI5 Modal Popover",
+							press: function (oEvent) {
+								new Popover({
+									title: "New OpenUI5 Modal Popover",
+									modal: true,
+									placement: "Bottom",
+									content: [
+										new Button({
+											text: "Focus stop"
+										}),
+										new Button({
+											text: "Open Ui5 Dialog",
+											press: function () {
+												openUI5Dialog3();
+											}
+										}),
+										new Button({
+											text: "Open WebC Dialog",
+											press: function () {
+												document.getElementById("newDialog4").open = true;
+											}
 										})
 									],
 									initialFocus: "someButton",
@@ -189,7 +310,7 @@
 	<div id="buttonP">
 		<ui5-button id="myButton">Open WebC Dialog</ui5-button>
 	</div>
-	<ui5-dialog id="dialog1" header-text="This is an WebC Dialog 1">
+	<ui5-dialog id="dialog1" draggable header-text="This is a Web Component Dialog 1">
 		<div id="dialog1content"></div>
 		<br >
 		Web Components:
@@ -211,19 +332,30 @@
 		<ui5-button id="dialogButton">Open UI5 dialog</ui5-button>
 		<ui5-button id="popoverButtonNoFocus">Open UI5 Popover No Initial Focus</ui5-button>
 	</ui5-dialog>
-	<ui5-dialog id="newDialog1" header-text="This is an WebC Dialog 2">
-		<ui5-button id="someButton">Some button</ui5-button>
+	<ui5-dialog id="newDialog1" draggable header-text="This is a Web Component Dialog 1">
+		<ui5-button id="someButton2">Some button 1</ui5-button>
+	</ui5-dialog>
+	<ui5-dialog id="newDialog2" draggable header-text="This is a Web Component Dialog 2">
+		<ui5-button id="someButton3">Open UI5 Dialog</ui5-button>
+		<ui5-button id="openUi5PopoverBlockLayer">Open UI5 Popover</ui5-button>
+	</ui5-dialog>
+	<ui5-dialog id="newDialog3" draggable header-text="This is a Web Component Dialog 3">
+		<ui5-button id="someButton4">Open WebC Dialog</ui5-button>
+	</ui5-dialog>
+
+	<ui5-dialog id="newDialog4" draggable header-text="This is a Web Component Dialog 4">
+		<ui5-button id="someButton5">Some button 3</ui5-button>
 	</ui5-dialog>
 	<div id="content"></div>
 	<ui5-responsive-popover id="respPopover"
 							opener="openResPopoverButton"
-							header-text="This is an WebC Responsive Popover">
+							header-text="This is a Web Component Responsive Popover">
 		<ui5-button>Some button</ui5-button>
 	</ui5-responsive-popover>
 	<ui5-responsive-popover id="respPopoverNoInitialFocus"
 							prevent-initial-focus
 							opener="openResPopoverNoInitialFocusButton"
-							header-text="This is an WebC RP with no initial focus">
+							header-text="This is a Web Component RP with no initial focus">
 		<ui5-button>Some button</ui5-button>
 	</ui5-responsive-popover>