1 files changed, 19 insertions, 1 deletions
diff --git a/plugins/CoreHome/angularjs/common/services/reporting-pages-model.js b/plugins/CoreHome/angularjs/common/services/reporting-pages-model.js
index 1f0bbd91d7..80f5d08cb6 100644
--- a/plugins/CoreHome/angularjs/common/services/reporting-pages-model.js
+++ b/plugins/CoreHome/angularjs/common/services/reporting-pages-model.js
@@ -16,18 +16,36 @@
         var model = {
             pages : [],
             findPage: findPage,
+            findPageInCategory: findPageInCategory,
             reloadAllPages : reloadAllPages,
             getAllPages : getAllPages
         };
 
         return model;
 
+        function findPageInCategory(categoryId) {
+            var found = null;
+
+            angular.forEach(model.pages, function (page) {
+                // happens when user switches between sites, in this case check if the same category exists and if so,
+                // select first entry from that category
+                if (!found && page &&
+                    page.category && page.subcategory &&
+                    page.category.id === categoryId && page.subcategory.id) {
+                    found = page;
+                }
+            });
+
+            return found;
+        }
+
         function findPage(categoryId, subcategoryId)
         {
             var found = null;
 
             angular.forEach(model.pages, function (page) {
-                if (page &&
+                if (!found &&
+                    page &&
                     page.category && page.subcategory &&
                     page.category.id === categoryId && ('' + page.subcategory.id) === subcategoryId) {
                     found = page;