diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index b0722e0fdda15c6195429daa3824aae5621a169f..c681901ddd4bbb77e4cdb8573ec25b281aa19438 100644
--- a/src/controls/ScrollView.qml
+++ b/src/controls/ScrollView.qml
@@ -146,11 +146,11 @@ FocusScope {
         if (contentItem.hasOwnProperty("contentY") && // Check if flickable
                 contentItem.hasOwnProperty("contentHeight")) {
             internal.flickableItem = contentItem // "Use content if it is a flickable
+            internal.flickableItem.parent = viewportItem
         } else {
-            internal.flickableItem = flickableComponent.createObject(internal)
+            internal.flickableItem = flickableComponent.createObject(viewportItem)
             contentItem.parent = internal.flickableItem.contentItem
         }
-        internal.flickableItem.parent = viewportItem
         internal.flickableItem.anchors.fill = viewportItem
     }