diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/TexturePane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/TexturePane.qml
index e7c25024108..a4f961eca46 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/TexturePane.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/TexturePane.qml
@@ -34,16 +34,14 @@ Rectangle {
             Layout.fillWidth: true
         }
 
-        Texture.TopSection {
-            id: topSection
-
-            Layout.fillWidth: true
-        }
-
         PropertyEditorPane {
             Layout.fillWidth: true
             Layout.fillHeight: true
 
+            headerComponent: Texture.TopSection {
+                id: topSection
+            }
+
             DynamicPropertiesSection {
                 propertiesModel: PropertyEditorDynamicPropertiesModel {}
                 visible: !hasMultiSelection
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PropertyEditorPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PropertyEditorPane.qml
index 74c66c39f35..e0907551642 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PropertyEditorPane.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PropertyEditorPane.qml
@@ -39,6 +39,7 @@ Rectangle {
         id: propertySearchBar
 
         contentItem: mainColumn
+        anchors.top: itemPane.top
         width: parent.width
         z: parent.z + 1
     }
@@ -73,6 +74,7 @@ Rectangle {
 
     Rectangle {
         id: stateSection
+        anchors.top: toolbar.bottom
         width: itemPane.width
         height: StudioTheme.Values.height + StudioTheme.Values.controlGap * 2
         color:  StudioTheme.Values.themePanelBackground