diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
index 6eccae8423..cdd15f2ce4 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
@@ -2,7 +2,6 @@
 // Toolbox is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
-import QtQuick.Dialogs 1.1
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import UM 1.1 as UM
diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
index 5b93ba74bc..d7101f40b3 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
@@ -2,7 +2,6 @@
 // Toolbox is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
-import QtQuick.Dialogs 1.1
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import UM 1.1 as UM
diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
index c7904076dd..075902904f 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
@@ -30,6 +30,7 @@ ScrollView
         height: childrenRect.height + 4 * UM.Theme.getSize("default_margin").height
         Label
         {
+            visible: toolbox.pluginsInstalledModel.items.length > 0
             width: parent.width
             text: catalog.i18nc("@title:tab", "Plugins")
             color: UM.Theme.getColor("text_medium")
@@ -37,6 +38,7 @@ ScrollView
         }
         Rectangle
         {
+            visible: toolbox.pluginsInstalledModel.items.length > 0
             color: "transparent"
             width: parent.width
             height: childrenRect.height + 1 * UM.Theme.getSize("default_lining").width
@@ -65,6 +67,7 @@ ScrollView
         }
         Label
         {
+            visible: toolbox.materialsInstalledModel.items.length > 0
             width: base.width
             text: catalog.i18nc("@title:tab", "Materials")
             color: UM.Theme.getColor("text_medium")
@@ -72,6 +75,7 @@ ScrollView
         }
         Rectangle
         {
+            visible: toolbox.materialsInstalledModel.items.length > 0
             color: "transparent"
             width: parent.width
             height: childrenRect.height + 1 * UM.Theme.getSize("default_lining").width
@@ -79,7 +83,7 @@ ScrollView
             border.width: UM.Theme.getSize("default_lining").width
             Column
             {
-                height: childrenRect.height
+                height: Math.max( UM.Theme.getSize("wide_margin").height, childrenRect.height)
                 anchors
                 {
                     top: parent.top
diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml
index 6a4f3e7705..1a847ab15e 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml
@@ -62,6 +62,7 @@ Item
     {
         id: authorInfo
         height: parent.height
+        width: Math.floor(UM.Theme.getSize("toolbox_action_button").width * 1.25)
         anchors
         {
             top: parent.top