diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml
index b2bab4355a..7cc5a730f2 100644
--- a/plugins/Toolbox/resources/qml/Toolbox.qml
+++ b/plugins/Toolbox/resources/qml/Toolbox.qml
@@ -44,31 +44,36 @@ Window
                 top: header.bottom
                 bottom: footer.top
             }
-
-            Loader
+            // TODO: This could be improved using viewFilter instead of viewCategory
+            ToolboxLoadingPage
             {
-                anchors.fill:parent
-                source:
-                {
-                    if(toolbox.viewCategory == "installed")
-                    {
-                        return "ToolboxInstalledPage.qml"
-                    }
-
-                    switch (toolbox.viewPage)
-                    {
-                        case "loading":
-                            return "ToolboxLoadingPage.qml"
-                        case "errored":
-                            return "ToolboxErrorPage.qml"
-                        case "overview":
-                            return "ToolboxDownloadsPage.qml"
-                        case "detail":
-                            return "ToolboxDetailPage.qml"
-                        case "author":
-                            return "ToolboxAuthorPage.qml"
-                    }
-                }
+                id: viewLoading
+                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "loading"
+            }
+            ToolboxErrorPage
+            {
+                id: viewErrored
+                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "errored"
+            }
+            ToolboxDownloadsPage
+            {
+                id: viewDownloads
+                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "overview"
+            }
+            ToolboxDetailPage
+            {
+                id: viewDetail
+                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "detail"
+            }
+            ToolboxAuthorPage
+            {
+                id: viewAuthor
+                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "author"
+            }
+            ToolboxInstalledPage
+            {
+                id: installedPluginList
+                visible: toolbox.viewCategory == "installed"
             }
         }
 
@@ -90,7 +95,7 @@ Window
                 licenseDialog.show();
             }
         }
-
+        
         ToolboxLicenseDialog
         {
             id: licenseDialog
diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py
index 68919cf987..ef67dc3c86 100644
--- a/plugins/Toolbox/src/Toolbox.py
+++ b/plugins/Toolbox/src/Toolbox.py
@@ -622,39 +622,44 @@ class Toolbox(QObject, Extension):
 
         if reply.operation() == QNetworkAccessManager.GetOperation:
             for response_type, url in self._request_urls.items():
-                if reply.url() != url:
-                    continue
+                if reply.url() == url:
+                    if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200:
+                        try:
+                            json_data = json.loads(bytes(reply.readAll()).decode("utf-8"))
 
-                if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200:
-                    try:
-                        json_data = json.loads(bytes(reply.readAll()).decode("utf-8"))
-                    except json.decoder.JSONDecodeError:
-                        Logger.log("w", "Received invalid JSON for %s.", response_type)
-                        break
+                            # Check for errors:
+                            if "errors" in json_data:
+                                for error in json_data["errors"]:
+                                    Logger.log("e", "%s", error["title"])
+                                return
 
-                    # Check for errors:
-                    if "errors" in json_data:
-                        for error in json_data["errors"]:
-                            Logger.log("e", "%s", error["title"])
-                        return
+                            # Create model and apply metadata:
+                            if not self._models[response_type]:
+                                Logger.log("e", "Could not find the %s model.", response_type)
+                                break
+                            
+                            self._server_response_data[response_type] = json_data["data"]
+                            self._models[response_type].setMetadata(self._server_response_data[response_type])
 
-                    self._server_response_data[response_type] = json_data["data"]
-                    self._models[response_type].setMetadata(json_data["data"])
+                            if response_type is "packages":
+                                self._models[response_type].setFilter({"type": "plugin"})
+                                self.reBuildMaterialsModels()
+                                self.reBuildPluginsModels()
+                            elif response_type is "authors":
+                                self._models[response_type].setFilter({"package_types": "material"})
+                                self._models[response_type].setFilter({"tags": "generic"})
 
-                    if response_type is "packages":
-                        self._models["packages"].setFilter({"type": "plugin"})
-                        self.reBuildMaterialsModels()
-                        self.reBuildPluginsModels()
-                    elif response_type is "authors":
-                        self._models["authors"].setFilter({"tags": "generic"})
+                            self.metadataChanged.emit()
 
-                    self.metadataChanged.emit()
+                            if self.isLoadingComplete():
+                                self.setViewPage("overview")
 
-                    if self.isLoadingComplete():
-                        self.setViewPage("overview")
-                else:
-                    self.setViewPage("errored")
-                    self.resetDownload()
+                        except json.decoder.JSONDecodeError:
+                            Logger.log("w", "Received invalid JSON for %s.", response_type)
+                            break
+                    else:
+                        self.setViewPage("errored")
+                        self.resetDownload()
         else:
             # Ignore any operation that is not a get operation
             pass