diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
index 0c75244ba4..f632d69e62 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
@@ -101,20 +101,29 @@
         }
 
         function selectCategory(selectedCategory, categories) {
+            var reset = false;
             for (var i = 0; i < categories.length; i++) {
                 var category = categories[i];
+                if (category.name === selectedCategory.name && category.active === true) {
+                    //it's already selected, let's unselect to show all again
+                    reset = true;
+                }
                 category.active = false;
             }
 
             vm.loading = true;
             vm.searchQuery = "";
+            var searchCategory = selectedCategory.name;
+            if (reset === true) {
+                searchCategory = "";
+            }
 
             $q.all([                    
-                    ourPackageRepositoryResource.getPopular(8, selectedCategory.name)
+                    ourPackageRepositoryResource.getPopular(8, searchCategory)
                     .then(function(pack) {
                         vm.popular = pack.packages;
                     }),
-                    ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize, selectedCategory.name, vm.searchQuery)
+                    ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize, searchCategory, vm.searchQuery)
                     .then(function(pack) {
                         vm.packages = pack.packages;
                         vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize);
@@ -123,7 +132,7 @@
                 ])
                 .then(function() {
                     vm.loading = false;
-                    selectedCategory.active = true;
+                    selectedCategory.active = reset === false;
                 });
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
index 8f45dd90a9..506ee3efca 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
@@ -86,7 +86,7 @@
                 </div> <!-- end packages -->
             </div>
 
-            <div class="umb-packages__pagination">
+            <div class="umb-packages__pagination" ng-if="vm.pagination.totalPages > 1">
 
                 <umb-pagination page-number="vm.pagination.pageNumber"
                                 total-pages="vm.pagination.totalPages"