diff --git a/plugins/Marketplace/PackageList.py b/plugins/Marketplace/PackageList.py
index 257b71f6a0..b93cec1183 100644
--- a/plugins/Marketplace/PackageList.py
+++ b/plugins/Marketplace/PackageList.py
@@ -33,6 +33,7 @@ class PackageList(ListModel):
     PackageRole = Qt.UserRole + 1
 
     ITEMS_PER_PAGE = 20  # Pagination of number of elements to download at once.
+    INCLUDED_PACKAGE_TYPE = ("material", "plugin")  # Only show these kind of packages
 
     def __init__(self, parent: "QObject" = None) -> None:
         super().__init__(parent)
@@ -121,8 +122,9 @@ class PackageList(ListModel):
             return
 
         for package_data in response_data["data"]:
-            package = PackageModel(package_data, parent = self)
-            self.appendItem({"package": package})  # Add it to this list model.
+            if package_data["package_type"] in self.INCLUDED_PACKAGE_TYPE:
+                package = PackageModel(package_data, parent = self)
+                self.appendItem({"package": package})  # Add it to this list model.
 
         self._request_url = response_data["links"].get("next", "")  # Use empty string to signify that there is no next page.
         self.hasMoreChanged.emit()
diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml
index 2b17d3ebf3..2213b3d456 100644
--- a/plugins/Marketplace/resources/qml/Marketplace.qml
+++ b/plugins/Marketplace/resources/qml/Marketplace.qml
@@ -7,6 +7,7 @@ import QtQuick.Layouts 1.15
 import QtQuick.Window 2.2
 
 import UM 1.2 as UM
+import Cura 1.6 as Cura
 
 Window
 {
@@ -18,6 +19,18 @@ Window
     width: minimumWidth
     height: minimumHeight
 
+    // Set and unset the content. No need to keep things in memory if it's not visible.
+    onVisibleChanged: content.source = visible ? "Plugins.qml" : ""
+
+    Connections
+    {
+        target: Cura.API.account
+        function onLoginStateChanged()
+        {
+            close();
+        }
+    }
+
     title: "Marketplace" //Seen by Ultimaker as a brand name, so this doesn't get translated.
     modality: Qt.NonModal
 
@@ -61,9 +74,9 @@ Window
 
                 Loader //Page contents.
                 {
+                    id: content
                     anchors.fill: parent
                     anchors.margins: UM.Theme.getSize("default_margin").width
-
                     source: "Plugins.qml"
                 }
             }
diff --git a/plugins/Marketplace/resources/qml/Plugins.qml b/plugins/Marketplace/resources/qml/Plugins.qml
index dca1b8762b..0fbe8b7734 100644
--- a/plugins/Marketplace/resources/qml/Plugins.qml
+++ b/plugins/Marketplace/resources/qml/Plugins.qml
@@ -9,6 +9,7 @@ import UM 1.4 as UM
 ScrollView
 {
     clip: true
+    ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
 
     ListView
     {
@@ -170,4 +171,4 @@ ScrollView
             }
         }
     }
-}
\ No newline at end of file
+}