diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
index 392b867071..ebd4c006f8 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
@@ -114,7 +114,10 @@ Item
                     else
                     {
                         toolbox.viewPage = "author"
-                        toolbox.filterModelByProp("packages", "author_id", model.id)
+                        toolbox.setFilters("packages", {
+                            "author_id": model.id,
+                            "type": "material"
+                        })
                     }
                     break
                 default:
diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml
index 2ca0b522fe..15d1ae302c 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml
@@ -105,8 +105,21 @@ Rectangle
             switch(toolbox.viewCategory)
             {
                 case "material":
-                    toolbox.viewPage = "author"
-                    toolbox.filterModelByProp("packages", "author_name", model.name)
+
+                    // If model has a type, it must be a package
+                    if (model.type !== undefined)
+                    {
+                        toolbox.viewPage = "detail"
+                        toolbox.filterModelByProp("packages", "id", model.id)
+                    }
+                    else
+                    {
+                        toolbox.viewPage = "author"
+                        toolbox.setFilters("packages", {
+                            "author_id": model.id,
+                            "type": "material"
+                        })
+                    }
                     break
                 default:
                     toolbox.viewPage = "detail"
diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py
index a9d0bb03d1..c4205b8ed5 100644
--- a/plugins/Toolbox/src/Toolbox.py
+++ b/plugins/Toolbox/src/Toolbox.py
@@ -776,17 +776,25 @@ class Toolbox(QObject, Extension):
     # Filter Models:
     # --------------------------------------------------------------------------
     @pyqtSlot(str, str, str)
-    def filterModelByProp(self, modelType: str, filterType: str, parameter: str):
-        if not self._models[modelType]:
-            Logger.log("w", "Toolbox: Couldn't filter %s model because it doesn't exist.", modelType)
+    def filterModelByProp(self, model_type: str, filter_type: str, parameter: str) -> None:
+        if not self._models[model_type]:
+            Logger.log("w", "Toolbox: Couldn't filter %s model because it doesn't exist.", model_type)
             return
-        self._models[modelType].setFilter({ filterType: parameter })
+        self._models[model_type].setFilter({filter_type: parameter})
         self.filterChanged.emit()
 
-    @pyqtSlot()
-    def removeFilters(self, modelType: str):
-        if not self._models[modelType]:
-            Logger.log("w", "Toolbox: Couldn't remove filters on %s model because it doesn't exist.", modelType)
+    @pyqtSlot(str, "QVariantMap")
+    def setFilters(self, model_type: str, filter_dict: dict) -> None:
+        if not self._models[model_type]:
+            Logger.log("w", "Toolbox: Couldn't filter %s model because it doesn't exist.", model_type)
             return
-        self._models[modelType].setFilter({})
+        self._models[model_type].setFilter(filter_dict)
+        self.filterChanged.emit()
+
+    @pyqtSlot(str)
+    def removeFilters(self, model_type: str) -> None:
+        if not self._models[model_type]:
+            Logger.log("w", "Toolbox: Couldn't remove filters on %s model because it doesn't exist.", model_type)
+            return
+        self._models[model_type].setFilter({})
         self.filterChanged.emit()