diff --git a/src/views/apps.js b/src/views/apps.js
index 2c8d091d2..61653a571 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -59,26 +59,30 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
     };
 
     Client.onReady(function () {
-        Client.refreshInstalledApps(function () {}); // refresh the new list immediately when switching from another view (appstore)
+        // refresh the new list immediately when switching from another view (appstore)
+        Client.refreshInstalledApps(function () {
+            var refreshAppsTimer = $interval(Client.refreshInstalledApps.bind(Client, function () {}), 5000);
+            $scope.$on('$destroy', function () {
+                $interval.cancel(refreshAppsTimer);
+            });
 
-        var refreshAppsTimer = $interval(Client.refreshInstalledApps.bind(Client, function () {}), 5000);
-        $scope.$on('$destroy', function () {
-            $interval.cancel(refreshAppsTimer);
-        });
+            if (!$scope.user.admin) return;
 
-        if (!$scope.user.admin) return;
+            Client.getDomains(function (error, result) {
+                if (error) Client.error(error);
 
-        Client.getDomains(function (error, result) {
-            if (error) Client.error(error);
+                $scope.domains = result;
+                $scope.filterDomains = [ALL_DOMAINS_DOMAIN].concat(result);
 
-            $scope.domains = result;
-            $scope.filterDomains = [ALL_DOMAINS_DOMAIN].concat(result);
+                // load local settings and apply
+                if (localStorage.selectedTags) {
+                    if (!$scope.tags.length) localStorage.removeItem('selectedTags');
+                    else $scope.selectedTags = localStorage.selectedTags.split(',');
+                }
+                if (localStorage.selectedDomain) $scope.selectedDomain = $scope.filterDomains.find(function (d) { return d.domain === localStorage.selectedDomain; }) || ALL_DOMAINS_DOMAIN;
 
-            // load local settings and apply
-            if (localStorage.selectedTags) $scope.selectedTags = localStorage.selectedTags.split(',');
-            if (localStorage.selectedDomain) $scope.selectedDomain = $scope.filterDomains.find(function (d) { return d.domain === localStorage.selectedDomain; }) || ALL_DOMAINS_DOMAIN;
-
-            setTimeout(function () { $('#appSearch').focus(); }, 1000);
+                setTimeout(function () { $('#appSearch').focus(); }, 1000);
+            });
         });
     });