diff --git a/src/app/organization/organizationVaultController.js b/src/app/organization/organizationVaultController.js
index d910e8e573f..072f6408065 100644
--- a/src/app/organization/organizationVaultController.js
+++ b/src/app/organization/organizationVaultController.js
@@ -51,7 +51,11 @@
 
             $q.all([collectionPromise, cipherPromise]).then(function () {
                 $scope.loading = false;
-                $("#search").focus();
+                $timeout(function () {
+                    if ($('body').hasClass('control-sidebar-open')) {
+                        $("#search").focus();
+                    }
+                }, 500);
 
                 if ($state.params.search) {
                     $uibModalStack.dismissAll();
diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index cc975f8b2bd..b24a70c6c11 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -22,7 +22,11 @@
         }
 
         $scope.$on('$viewContentLoaded', function () {
-            $("#search").focus();
+            $timeout(function () {
+                if ($('body').hasClass('control-sidebar-open')) {
+                    $("#search").focus();
+                }
+            }, 500);
 
             if (($rootScope.vaultFolders || $rootScope.vaultCollections) && $rootScope.vaultCiphers) {
                 $scope.loading = false;
diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html
index 64d5a464aff..6b036f06fc2 100644
--- a/src/app/vault/views/vault.html
+++ b/src/app/vault/views/vault.html
@@ -222,7 +222,7 @@
         <div class="control-sidebar-section" ng-show="!loading && vaultCollections.length">
             <ul class="control-sidebar-menu">
                 <li ng-repeat="collection in vaultCollections | orderBy: [groupingSort] track by collection.id"
-                    ng-class="{active: selectedCollection && collection.id === selectedCollection}">
+                    ng-class="{active: selectedCollection && collection.id === selectedCollection.id}">
                     <a href="#" stop-click ng-click="filterCollection(collection)">
                         <i class="fa fa-caret-right fa-fw"></i>
                         {{collection.name}}