diff --git a/packages/main/cypress/specs/Dialog.cy.tsx b/packages/main/cypress/specs/Dialog.cy.tsx
index dc16054d69f4..0520bb89aa8a 100644
--- a/packages/main/cypress/specs/Dialog.cy.tsx
+++ b/packages/main/cypress/specs/Dialog.cy.tsx
@@ -1,4 +1,5 @@
 import "@ui5/webcomponents-base/dist/features/F6Navigation.js";
+import ResizeHandler from "@ui5/webcomponents-base/dist/delegate/ResizeHandler.js";
 import Dialog from "../../src/Dialog.js";
 import Label from "../../src/Label.js";
 import Title from "../../src/Title.js";
@@ -379,6 +380,32 @@ describe("Dialog general interaction", () => {
 			.should("not.be.visible");
 	});
 
+	it("dialog ResizeHandler registration", () => {
+		cy.spy(ResizeHandler, "register").as("registerResizeSpy");
+
+		cy.mount(
+			<>
+				<Dialog id="dialog">
+					<div>Content</div>
+				</Dialog>
+			</>
+		);
+
+		cy.get<Dialog>("#dialog")
+			.should((dialog => {
+				expect(dialog.get(0).getDomRef()).to.exist;
+			}));
+
+		cy.get("@registerResizeSpy")
+			.should("not.be.called");
+
+		cy.get("#dialog")
+			.invoke("attr", "open", true);
+
+		cy.get("@registerResizeSpy")
+			.should("be.calledOnce");
+	});
+
 
 	it("dialog repositions after screen resize", () => {
 		cy.mount(
diff --git a/packages/main/src/Popup.ts b/packages/main/src/Popup.ts
index fa486e761d42..69a439209610 100644
--- a/packages/main/src/Popup.ts
+++ b/packages/main/src/Popup.ts
@@ -272,11 +272,17 @@ abstract class Popup extends UI5Element {
 		renderFinished().then(() => {
 			this._updateMediaRange();
 		});
+
+		ResizeHandler.deregister(this, this._resizeHandler);
+
+		if (this._opened) {
+			ResizeHandler.register(this, this._resizeHandler);
+		}
 	}
 
 	onEnterDOM() {
 		this.setAttribute("popover", "manual");
-		ResizeHandler.register(this, this._resizeHandler);
+
 		if (isDesktop()) {
 			this.setAttribute("desktop", "");
 		}
diff --git a/packages/main/test/pages/Dialog.html b/packages/main/test/pages/Dialog.html
index d66094cad107..b22a9d3d7108 100644
--- a/packages/main/test/pages/Dialog.html
+++ b/packages/main/test/pages/Dialog.html
@@ -83,6 +83,9 @@
 		<br>
 		<br>
 		<ui5-button id="multiple-show">Open dialog calling ".open = true" multiple times</ui5-button>
+		<br>
+		<br>
+		<ui5-button id="open-big-content">Open dialog with big content</ui5-button>
 	</div>
 	<ui5-block-layer></ui5-block-layer>
 
@@ -719,6 +722,113 @@
 		<ui5-button id="scrolledBtn" class="scrolledBtn">open</ui5-button>
 	</div>
 
+	<ui5-dialog id="dlgBigContent" header-text="Register Form">
+		<section class="login-form">
+			<div>
+				<ui5-label for="username" required show-colon>Username</ui5-label>
+				<ui5-input id="username"></ui5-input>
+			</div>
+			<div>
+				<ui5-label for="password" required show-colon>Password</ui5-label>
+				<ui5-input id="password" type="Password" value-state="Negative"></ui5-input>
+			</div>
+			<div>
+				<ui5-label for="email" type="Email" required show-colon>Email</ui5-label>
+				<ui5-input id="email"></ui5-input>
+			</div>
+			<div>
+				<ui5-label for="address" show-colon>Address</ui5-label>
+				<ui5-input id="address"></ui5-input>
+			</div>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+			<ui5-input></ui5-input>
+			<ui5-button>Button</ui5-button>
+		</section>
+		<ui5-toolbar slot="footer">
+			<ui5-toolbar-button
+				design="Emphasized"
+				text="Submit"
+			>
+			</ui5-toolbar-button>
+			<ui5-toolbar-button
+				design="Transparent"
+				text="Cancel"
+			>
+			</ui5-toolbar-button>
+		</ui5-toolbar>
+	</ui5-dialog>
+
 	<script>
 		cbCompact.addEventListener("ui5-change", function () {
 			document.body.classList.toggle("ui5-content-density-compact", cbCompact.checked);
@@ -966,6 +1076,10 @@
 		document.getElementById("theme-switch").addEventListener("ui5-selection-change", event => {
 			window["sap-ui-webcomponents-bundle"].configuration.setTheme(event.detail.selectedItems[0].getAttribute("data-ui5-theme-name"));
 		});
+
+		document.getElementById("open-big-content").addEventListener("click", function () {
+			window["dlgBigContent"].open = true;
+		});
 	</script>
 </body>