diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js
index 42af3209..308afe31 100644
--- a/js/app/controllers/credential.js
+++ b/js/app/controllers/credential.js
@@ -102,7 +102,7 @@
 							}
 							angular.merge($scope.active_vault.credentials, _credentials);
 							$scope.show_spinner = false;
-
+							$rootScope.$broadcast('credentials_loaded');
 							if(!vault.private_sharing_key){
 								var key_size = 1024;
 								ShareService.generateRSAKeys(key_size).then(function (kp) {
diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js
index 8bc8f391..f892af38 100644
--- a/js/app/controllers/menu.js
+++ b/js/app/controllers/menu.js
@@ -81,6 +81,10 @@
 					$scope.selectedTags.push(tag);
 				};
 
+				$rootScope.$on('credentials_loaded', function () {
+					$rootScope.$broadcast('selected_tags_updated', $scope.selectedTags);
+				});
+
 				$scope.available_tags = TagService.getTags();
 
 				$scope.$watch(function () {
diff --git a/js/app/directives/credentialcounter.js b/js/app/directives/credentialcounter.js
index 90eefaa3..c637e848 100644
--- a/js/app/directives/credentialcounter.js
+++ b/js/app/directives/credentialcounter.js
@@ -48,7 +48,7 @@
 						if(!scope.vault.hasOwnProperty('credentials')){
 							return;
 						}
-						
+
 						angular.forEach(scope.vault.credentials, function (credential) {
 							var pos = scope.filteredCredentials.map(function(c) { return c.guid; }).indexOf(credential.guid);