diff --git a/src/qtquick/qml/EntryDetails.qml b/src/qtquick/qml/EntryDetails.qml
--- a/src/qtquick/qml/EntryDetails.qml
+++ b/src/qtquick/qml/EntryDetails.qml
@@ -92,23 +92,16 @@
     }
     title: i18nc("Combined title for the entry details page made of the name of the entry, and the author's name", "%1 by %2").arg(component.name).arg(entryAuthor.name)
     titleDelegate: QtLayouts.RowLayout {
-        implicitHeight: title.height
+        QtLayouts.Layout.fillWidth: true
         Kirigami.Heading {
             id: title
             level: 1
 
             QtLayouts.Layout.fillWidth: true;
-            QtLayouts.Layout.preferredWidth: titleTextMetrics.width
-            QtLayouts.Layout.minimumWidth: titleTextMetrics.width
             opacity: component.isCurrentPage ? 1 : 0.4
             maximumLineCount: 1
             elide: Text.ElideRight
             text: component.title
-            TextMetrics {
-                id: titleTextMetrics
-                text: component.title
-                font: title.font
-            }
         }
         QtControls.ToolButton {
             text: component.downloadCount == 1 ? i18nc("Request installation of this item, available when there is exactly one downloadable item", "Install") : i18nc("Show installation options, where there is more than one downloadable item", "Install...");
diff --git a/src/qtquick/qml/Page.qml b/src/qtquick/qml/Page.qml
--- a/src/qtquick/qml/Page.qml
+++ b/src/qtquick/qml/Page.qml
@@ -95,22 +95,16 @@
     NewStuff.QuestionAsker {}
 
     titleDelegate: QtLayouts.RowLayout {
+        QtLayouts.Layout.fillWidth: true
         Kirigami.Heading {
             id: title
             level: 1
 
             QtLayouts.Layout.fillWidth: true;
-            QtLayouts.Layout.preferredWidth: titleTextMetrics.width
-            QtLayouts.Layout.minimumWidth: titleTextMetrics.width
             opacity: root.isCurrentPage ? 1 : 0.4
             maximumLineCount: 1
             elide: Text.ElideRight
             text: root.title
-            TextMetrics {
-                id: titleTextMetrics
-                text: root.title
-                font: title.font
-            }
         }
         QtControls.ButtonGroup {
             id: displayModeGroup