diff --git a/share/qtcreator/qmldesigner/newstateseditor/Main.qml b/share/qtcreator/qmldesigner/newstateseditor/Main.qml
index 3b3162f322e..1d6f6910dd1 100644
--- a/share/qtcreator/qmldesigner/newstateseditor/Main.qml
+++ b/share/qtcreator/qmldesigner/newstateseditor/Main.qml
@@ -520,6 +520,16 @@ Rectangle {
                     orientation: Qt.Vertical
                 }
 
+                flickableDirection: {
+                    if (frame.contentHeight <= scrollView.height)
+                        return Flickable.HorizontalFlick
+
+                    if (frame.contentWidth <= scrollView.width)
+                        return Flickable.VerticalFlick
+
+                    return Flickable.HorizontalAndVerticalFlick
+                }
+
                 Flickable {
                     id: frame
                     boundsMovement: Flickable.StopAtBounds