diff --git a/plugins/Marketplace/resources/qml/Plugins.qml b/plugins/Marketplace/resources/qml/Plugins.qml
index 6e78e9eff1..a613ac9d4f 100644
--- a/plugins/Marketplace/resources/qml/Plugins.qml
+++ b/plugins/Marketplace/resources/qml/Plugins.qml
@@ -10,158 +10,162 @@ ScrollView
 {
     clip: true
 
-    Column
+    ListView
     {
         id: pluginColumn
         width: parent.width
+
+        model: Marketplace.PackageList
+        {
+            id: pluginList
+        }
         spacing: UM.Theme.getSize("default_margin").height
 
-        Repeater
+        delegate: Rectangle
         {
-            model: Marketplace.PackageList
-            {
-                id: pluginList
-            }
-
-            delegate: Rectangle
-            {
-                width: pluginColumn.width
-                height: UM.Theme.getSize("card").height
-
-                color: UM.Theme.getColor("main_background")
-                radius: UM.Theme.getSize("default_radius").width
-
-                Label
-                {
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.left: parent.left
-                    anchors.leftMargin: (parent.height - height) / 2
-
-                    text: model.package.displayName
-                    font: UM.Theme.getFont("medium_bold")
-                    color: UM.Theme.getColor("text")
-                }
-            }
-        }
-        Button
-        {
-            id: loadMoreButton
-            width: parent.width
+            width: pluginColumn.width
             height: UM.Theme.getSize("card").height
 
-            enabled: pluginList.hasMore && !pluginList.isLoading || pluginList.errorMessage != ""
-            onClicked: pluginList.request()  //Load next page in plug-in list.
+            color: UM.Theme.getColor("main_background")
+            radius: UM.Theme.getSize("default_radius").width
 
-            background: Rectangle
+            Label
             {
-                anchors.fill: parent
-                radius: UM.Theme.getSize("default_radius").width
-                color: UM.Theme.getColor("main_background")
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: parent.left
+                anchors.leftMargin: (parent.height - height) / 2
+
+                text: model.package.displayName
+                font: UM.Theme.getFont("medium_bold")
+                color: UM.Theme.getColor("text")
             }
+        }
 
-            Row
+        footer: Item //Wrapper item to add spacing between content and footer.
+        {
+            width: parent.width
+            height: UM.Theme.getSize("card").height + pluginColumn.spacing
+            Button
             {
-                anchors.centerIn: parent
+                id: loadMoreButton
+                width: parent.width
+                height: UM.Theme.getSize("card").height
+                anchors.bottom: parent.bottom
 
-                spacing: UM.Theme.getSize("thin_margin").width
+                enabled: pluginList.hasMore && !pluginList.isLoading || pluginList.errorMessage != ""
+                onClicked: pluginList.request()  //Load next page in plug-in list.
 
-                states:
-                [
-                    State
-                    {
-                        name: "Error"
-                        when: pluginList.errorMessage != ""
-                        PropertyChanges
-                        {
-                            target: errorIcon
-                            visible: true
-                        }
-                        PropertyChanges
-                        {
-                            target: loadMoreIcon
-                            visible: false
-                        }
-                        PropertyChanges
-                        {
-                            target: loadMoreLabel
-                            text: catalog.i18nc("@button", "Failed to load plug-ins:") + " " + pluginList.errorMessage + "\n" + catalog.i18nc("@button", "Retry?")
-                        }
-                    },
-                    State
-                    {
-                        name: "Loading"
-                        when: pluginList.isLoading
-                        PropertyChanges
-                        {
-                            target: loadMoreIcon
-                            source: UM.Theme.getIcon("ArrowDoubleCircleRight")
-                            color: UM.Theme.getColor("action_button_disabled_text")
-                        }
-                        PropertyChanges
-                        {
-                            target: loadMoreLabel
-                            text: catalog.i18nc("@button", "Loading")
-                            color: UM.Theme.getColor("action_button_disabled_text")
-                        }
-                    },
-                    State
-                    {
-                        name: "LastPage"
-                        when: !pluginList.hasMore
-                        PropertyChanges
-                        {
-                            target: loadMoreIcon
-                            visible: false
-                        }
-                        PropertyChanges
-                        {
-                            target: loadMoreLabel
-                            text: catalog.i18nc("@button", "No more results to load")
-                            color: UM.Theme.getColor("action_button_disabled_text")
-                        }
-                    }
-                ]
-
-                Item
+                background: Rectangle
                 {
-                    width: (errorIcon.visible || loadMoreIcon.visible) ? UM.Theme.getSize("small_button_icon").width : 0
-                    height: UM.Theme.getSize("small_button_icon").height
-                    anchors.verticalCenter: loadMoreLabel.verticalCenter
-
-                    UM.StatusIcon
-                    {
-                        id: errorIcon
-                        anchors.fill: parent
-
-                        status: UM.StatusIcon.Status.ERROR
-                        visible: false
-                    }
-                    UM.RecolorImage
-                    {
-                        id: loadMoreIcon
-                        anchors.fill: parent
-
-                        source: UM.Theme.getIcon("ArrowDown")
-                        color: UM.Theme.getColor("secondary_button_text")
-
-                        RotationAnimator
-                        {
-                            target: loadMoreIcon
-                            from: 0
-                            to: 360
-                            duration: 1000
-                            loops: Animation.Infinite
-                            running: pluginList.isLoading
-                            alwaysRunToEnd: true
-                        }
-                    }
+                    anchors.fill: parent
+                    radius: UM.Theme.getSize("default_radius").width
+                    color: UM.Theme.getColor("main_background")
                 }
-                Label
+
+                Row
                 {
-                    id: loadMoreLabel
-                    text: catalog.i18nc("@button", "Load more")
-                    font: UM.Theme.getFont("medium_bold")
-                    color: UM.Theme.getColor("secondary_button_text")
+                    anchors.centerIn: parent
+
+                    spacing: UM.Theme.getSize("thin_margin").width
+
+                    states:
+                    [
+                        State
+                        {
+                            name: "Error"
+                            when: pluginList.errorMessage != ""
+                            PropertyChanges
+                            {
+                                target: errorIcon
+                                visible: true
+                            }
+                            PropertyChanges
+                            {
+                                target: loadMoreIcon
+                                visible: false
+                            }
+                            PropertyChanges
+                            {
+                                target: loadMoreLabel
+                                text: catalog.i18nc("@button", "Failed to load plug-ins:") + " " + pluginList.errorMessage + "\n" + catalog.i18nc("@button", "Retry?")
+                            }
+                        },
+                        State
+                        {
+                            name: "Loading"
+                            when: pluginList.isLoading
+                            PropertyChanges
+                            {
+                                target: loadMoreIcon
+                                source: UM.Theme.getIcon("ArrowDoubleCircleRight")
+                                color: UM.Theme.getColor("action_button_disabled_text")
+                            }
+                            PropertyChanges
+                            {
+                                target: loadMoreLabel
+                                text: catalog.i18nc("@button", "Loading")
+                                color: UM.Theme.getColor("action_button_disabled_text")
+                            }
+                        },
+                        State
+                        {
+                            name: "LastPage"
+                            when: !pluginList.hasMore
+                            PropertyChanges
+                            {
+                                target: loadMoreIcon
+                                visible: false
+                            }
+                            PropertyChanges
+                            {
+                                target: loadMoreLabel
+                                text: catalog.i18nc("@button", "No more results to load")
+                                color: UM.Theme.getColor("action_button_disabled_text")
+                            }
+                        }
+                    ]
+
+                    Item
+                    {
+                        width: (errorIcon.visible || loadMoreIcon.visible) ? UM.Theme.getSize("small_button_icon").width : 0
+                        height: UM.Theme.getSize("small_button_icon").height
+                        anchors.verticalCenter: loadMoreLabel.verticalCenter
+
+                        UM.StatusIcon
+                        {
+                            id: errorIcon
+                            anchors.fill: parent
+
+                            status: UM.StatusIcon.Status.ERROR
+                            visible: false
+                        }
+                        UM.RecolorImage
+                        {
+                            id: loadMoreIcon
+                            anchors.fill: parent
+
+                            source: UM.Theme.getIcon("ArrowDown")
+                            color: UM.Theme.getColor("secondary_button_text")
+
+                            RotationAnimator
+                            {
+                                target: loadMoreIcon
+                                from: 0
+                                to: 360
+                                duration: 1000
+                                loops: Animation.Infinite
+                                running: pluginList.isLoading
+                                alwaysRunToEnd: true
+                            }
+                        }
+                    }
+                    Label
+                    {
+                        id: loadMoreLabel
+                        text: catalog.i18nc("@button", "Load more")
+                        font: UM.Theme.getFont("medium_bold")
+                        color: UM.Theme.getColor("secondary_button_text")
+                    }
                 }
             }
         }