diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js
index 8c709b28..440af994 100644
--- a/js/app/controllers/credential.js
+++ b/js/app/controllers/credential.js
@@ -447,7 +447,7 @@
                     var creds_filtered=[];
 
                     for (var i = 0; i < $scope.active_vault.credentials.length; i++) {
-                        if($scope.active_vault.credentials[i].delete_time===0){
+                        if($scope.active_vault.credentials[i].delete_time===0 || $scope.delete_time > 0){
                             creds_filtered.push($scope.active_vault.credentials[i]);
                         }
                     }
diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js
index 0c1ed6b2..edf57b9f 100644
--- a/js/app/controllers/menu.js
+++ b/js/app/controllers/menu.js
@@ -134,7 +134,9 @@
                 	if(string !== "nav_trashbin"){
                         $scope.delete_time=0;
                         $rootScope.$broadcast('set_delete_time', $scope.delete_time);
-					}
+					} else {
+		                string = "all";
+	                }
 					$scope.selectedTags =[];
 
                     $rootScope.$broadcast('filterSpecial',string);