diff --git a/packages/main/src/Dialog.hbs b/packages/main/src/Dialog.hbs
index db7f25c22e13..61542f0b863b 100644
--- a/packages/main/src/Dialog.hbs
+++ b/packages/main/src/Dialog.hbs
@@ -1,16 +1,18 @@
 {{>include "./Popup.hbs"}}
 
 {{#*inline "beforeContent"}}
-	<header
-		class="ui5-popup-header-root"
-		id="ui5-popup-header"
-		@mousedown="{{_onDragMouseDown}}">
-		{{#if header.length }}
-			<slot name="header"></slot>
-		{{else}}
-			<h2 class="ui5-popup-header-text">{{headerText}}</h2>
-		{{/if}}
-	</header>
+	{{#if _displayHeader }}
+		<header
+			class="ui5-popup-header-root"
+			id="ui5-popup-header"
+			@mousedown="{{_onDragMouseDown}}">
+			{{#if header.length }}
+				<slot name="header"></slot>
+			{{else}}
+				<h2 class="ui5-popup-header-text">{{headerText}}</h2>
+			{{/if}}
+		</header>
+	{{/if}}
 {{/inline}}
 
 {{#*inline "afterContent"}}
diff --git a/packages/main/src/Dialog.js b/packages/main/src/Dialog.js
index 101e0c760f20..3914595a9892 100644
--- a/packages/main/src/Dialog.js
+++ b/packages/main/src/Dialog.js
@@ -203,6 +203,10 @@ class Dialog extends Popup {
 		return "flex";
 	}
 
+	get _displayHeader() {
+		return this.header.length || this.headerText;
+	}
+
 	show() {
 		super.show();
 		this._center();
diff --git a/packages/main/src/Popover.js b/packages/main/src/Popover.js
index be710d65b72e..99b50f6d82d3 100644
--- a/packages/main/src/Popover.js
+++ b/packages/main/src/Popover.js
@@ -659,7 +659,7 @@ class Popover extends Popup {
 	 * Hook for descendants to hide header.
 	 */
 	get _displayHeader() {
-		return true;
+		return this.header.length || this.headerText;
 	}
 
 	/**
diff --git a/packages/main/src/ResponsivePopover.js b/packages/main/src/ResponsivePopover.js
index 737cbd2deb6c..4b5a507c07db 100644
--- a/packages/main/src/ResponsivePopover.js
+++ b/packages/main/src/ResponsivePopover.js
@@ -163,7 +163,7 @@ class ResponsivePopover extends Popover {
 	}
 
 	get _displayHeader() {
-		return this._isPhone || !this.contentOnlyOnDesktop;
+		return (this._isPhone || !this.contentOnlyOnDesktop) && super._displayHeader;
 	}
 
 	get _displayFooter() {