diff --git a/packages/fiori/src/DynamicPageTitle.hbs b/packages/fiori/src/DynamicPageTitle.hbs
index bb537538df66..5bcb8e5de14a 100644
--- a/packages/fiori/src/DynamicPageTitle.hbs
+++ b/packages/fiori/src/DynamicPageTitle.hbs
@@ -17,11 +17,11 @@
       <slot name="{{headingSlotName}}"></slot>
     </div>
 
-  {{#if hasContent}}
-    <div class="{{classes.content}}"
-      style="{{styles.content}}">
-      <slot></slot>
-    </div>
+    {{#if hasContent}}
+      <div class="{{classes.content}}"
+        style="{{styles.content}}">
+        <slot></slot>
+      </div>
     {{/if}}
 
     <div class="{{classes.actions}}"
diff --git a/packages/fiori/src/DynamicPageTitle.ts b/packages/fiori/src/DynamicPageTitle.ts
index 20030c101037..9566942b9913 100644
--- a/packages/fiori/src/DynamicPageTitle.ts
+++ b/packages/fiori/src/DynamicPageTitle.ts
@@ -178,10 +178,10 @@ class DynamicPageTitle extends UI5Element {
 	}
 
 	onMinContentWidthChange(event: CustomEvent<ToolbarMinWidthChangeEventDetail>) {
-		const container = (<HTMLElement>event.target)?.assignedSlot?.parentElement;
-		if (container === this.getDomRef()?.querySelector(".ui5-dynamic-page-title--content")) {
+		const slotName = (<HTMLElement>event.target)?.assignedSlot?.name;
+		if (!slotName || slotName === "content") {
 			this.minContentWidth = event.detail.minWidth;
-		} else if (container === this.getDomRef()?.querySelector(".ui5-dynamic-page-title--actions")) {
+		} else if (slotName === "actions") {
 			this.minActionsWidth = event.detail.minWidth;
 		}
 	}