diff --git a/cura/Machines/Models/GlobalStacksModel.py b/cura/Machines/Models/GlobalStacksModel.py
index 6d091659a8..712597c2e7 100644
--- a/cura/Machines/Models/GlobalStacksModel.py
+++ b/cura/Machines/Models/GlobalStacksModel.py
@@ -72,8 +72,8 @@ class GlobalStacksModel(ListModel):
             section_name = self._catalog.i18nc("@info:title", section_name)
 
             default_removal_warning = self._catalog.i18nc(
-                "@label ({} is object name)",
-                "Are you sure you wish to remove {}? This cannot be undone!", device_name
+                "@label {0} is the name of a printer that's about to be deleted.",
+                "Are you sure you wish to remove {0}? This cannot be undone!", device_name
             )
             removal_warning = container_stack.getMetaDataEntry("removal_warning", default_removal_warning)
 
diff --git a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml
index dba9f19ccd..5514e555eb 100644
--- a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml
+++ b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml
@@ -48,7 +48,15 @@ Item
         onClicked:
         {
             toolbox.viewPage = "overview"
-            toolbox.filterModelByProp("packages", "type", toolbox.viewCategory)
+            if (toolbox.viewCategory == "material")
+            {
+                toolbox.filterModelByProp("authors", "package_types", "material")
+            }
+            else if (toolbox.viewCategory == "plugin")
+            {
+                toolbox.filterModelByProp("packages", "type", "plugin")
+            }
+
         }
         style: ButtonStyle
         {