diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml
index 3210559a688..eb79352ad9c 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml
@@ -128,14 +128,20 @@ T.ComboBox {
     }
 
     property ListView listView: ListView {
+        id: listView
         x: 0
         y: control.style.borderWidth
         width: control.width
-        height: control.listView.contentHeight
-        interactive: false
+        height: Math.min(control.style.maxComboBoxPopupHeight, control.listView.contentHeight)
         model: control.model
         Keys.onEscapePressed: comboBoxPopup.close()
         currentIndex: control.highlightedIndex
+        boundsBehavior: Flickable.StopAtBounds
+
+        ScrollBar.vertical: ScrollBar {
+            id: comboBoxPopupScrollBar
+            visible: listView.height < listView.contentHeight
+        }
 
         delegate: ItemDelegate {
             id: itemDelegate
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ControlStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ControlStyle.qml
index f8e959d8254..a759560117d 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ControlStyle.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ControlStyle.qml
@@ -71,6 +71,8 @@ QtObject {
     property real scrollBarActivePadding: Values.scrollBarActivePadding
     property real scrollBarInactivePadding: Values.scrollBarInactivePadding
 
+    property real dialogScreenMargin: Values.dialogScreenMargin
+
     // Special colors
     property color interaction: Values.themeInteraction
     property color interactionHover: Values.themeInteractionHover
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
index 092c6f2a724..a1089313673 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
@@ -185,6 +185,8 @@ QtObject {
     property real columnFactor: values.propertyLabelWidthMin
                                 / (values.propertyLabelWidthMin + values.controlColumnWidthMin)
 
+    property real dialogScreenMargin: Math.round(160 * values.scaleFactor)
+
     function responsiveResize(width) {
         var tmpWidth = width - values.sectionColumnSpacing
                        - values.sectionLeftPadding - values.sectionLayoutRightPadding