diff --git a/src/popup/app/config.js b/src/popup/app/config.js
index 6fc24b0e41..e834cdfa11 100644
--- a/src/popup/app/config.js
+++ b/src/popup/app/config.js
@@ -112,7 +112,7 @@
                 url: '/vault',
                 templateUrl: 'app/vault/views/vault.html',
                 controller: 'vaultController',
-                params: { syncOnLoad: false }
+                params: { syncOnLoad: false, searchText: null }
             })
             .state('tabs.settings', {
                 url: '/settings',
diff --git a/src/popup/app/current/currentController.js b/src/popup/app/current/currentController.js
index ed7c19f880..0530cf6ade 100644
--- a/src/popup/app/current/currentController.js
+++ b/src/popup/app/current/currentController.js
@@ -12,6 +12,8 @@ angular
 
         $scope.logins = [];
         $scope.loaded = false;
+        $scope.searchText = null;
+        $('#search').focus();
 
         $scope.$on('$viewContentLoaded', function () {
             $timeout(loadVault, 100);
@@ -101,6 +103,12 @@ angular
             return login.localData && login.localData.lastUsedDate ? -1 * login.localData.lastUsedDate : 0;
         };
 
+        $scope.searchVault = function () {
+            $state.go('tabs.vault', {
+                searchText: $scope.searchText
+            });
+        };
+
         $scope.$on('syncCompleted', function (event, successfully) {
             if ($scope.loaded) {
                 setTimeout(loadVault, 500);
diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index 602ba7a5ec..bd36e3d22d 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -1,8 +1,14 @@
-<div class="header">
+<div class="header header-search">
+    <div class="left">
+        <a href="" ng-click="main.expandVault()"><i class="fa fa-external-link fa-rotate-270 fa-lg"></i></a>
+    </div>
+    <div class="search" ng-style="{'visibility': main.disableSearch ? 'hidden' : 'visible'}">
+        <input type="search" placeholder="{{i18n.searchVault}}" id="search" ng-model="searchText" ng-change="searchVault()" />
+        <i class="fa fa-search"></i>
+    </div>
     <div class="right">
         <a href="" ng-click="addLogin()"><i class="fa fa-plus fa-lg"></i></a>
     </div>
-    <div class="title">{{i18n.currentTab}}</div>
 </div>
 <div class="content content-tabs">
     <div ng-if="logins.length">
diff --git a/src/popup/app/global/mainController.js b/src/popup/app/global/mainController.js
index 15f76efe74..3a19c94925 100644
--- a/src/popup/app/global/mainController.js
+++ b/src/popup/app/global/mainController.js
@@ -9,6 +9,7 @@ angular
         self.xsBody = $window.screen.availHeight < 600;
         self.smBody = !self.xsBody && $window.screen.availHeight <= 800;
         self.lgBody = !self.xsBody && !self.smBody && utilsService && !utilsService.isFirefox() && !utilsService.isEdge();
+        self.disableSearch = utilsService.isEdge();
 
         $scope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) {
             if (toParams.animation) {
@@ -20,6 +21,11 @@ angular
             }
         });
 
+        self.expandVault = function (e) {
+            $analytics.eventTrack('Expand Vault');
+            chrome.tabs.create({ url: $window.location.href });
+        };
+
         chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) {
             if (msg.command === 'syncCompleted') {
                 $scope.$broadcast('syncCompleted', msg.successfully);
diff --git a/src/popup/app/settings/views/settings.html b/src/popup/app/settings/views/settings.html
index afa7c78705..2ebd1f094a 100644
--- a/src/popup/app/settings/views/settings.html
+++ b/src/popup/app/settings/views/settings.html
@@ -1,4 +1,7 @@
 <div class="header">
+    <div class="left">
+        <a href="" ng-click="main.expandVault()"><i class="fa fa-external-link fa-rotate-270 fa-lg"></i></a>
+    </div>
     <div class="title">{{i18n.settings}}</div>
 </div>
 <div class="content content-tabs">
diff --git a/src/popup/app/tools/views/tools.html b/src/popup/app/tools/views/tools.html
index 181635d8e1..291fa22cd3 100644
--- a/src/popup/app/tools/views/tools.html
+++ b/src/popup/app/tools/views/tools.html
@@ -1,4 +1,7 @@
 <div class="header">
+    <div class="left">
+        <a href="" ng-click="main.expandVault()"><i class="fa fa-external-link fa-rotate-270 fa-lg"></i></a>
+    </div>
     <div class="title">{{i18n.tools}}</div>
 </div>
 <div class="content content-tabs">
diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js
index b488271e01..8142ace3fa 100644
--- a/src/popup/app/vault/vaultController.js
+++ b/src/popup/app/vault/vaultController.js
@@ -9,7 +9,6 @@
         $scope.i18n = i18nService;
         $scope.showFolderCounts = !utilsService.isEdge();
         $scope.showOnlyFolderView = utilsService.isEdge();
-        $scope.disableSearch = utilsService.isEdge();
         $('#search').focus();
 
         var syncOnLoad = $stateParams.syncOnLoad;
@@ -84,8 +83,8 @@
         }
 
         $scope.searchText = null;
-        if (state.searchText) {
-            $scope.searchText = state.searchText;
+        if (state.searchText || $stateParams.searchText) {
+            $scope.searchText = state.searchText || $stateParams.searchText;
         }
 
         $scope.folderSort = function (item) {
@@ -158,11 +157,6 @@
             $timeout(loadVault, 500);
         });
 
-        $scope.expandVault = function (e) {
-            $analytics.eventTrack('Expand Vault');
-            chrome.tabs.create({ url: '/popup/index.html#!/tab/vault' });
-        };
-
         function storeState() {
             stateService.saveState(stateKey, {
                 scrollY: getScrollY(),
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index ea46423b46..640ad54162 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -1,9 +1,9 @@
 <div class="header header-search">
     <div class="left">
-        <a href="" ng-click="expandVault()"><i class="fa fa-external-link fa-rotate-270 fa-lg"></i></a>
+        <a href="" ng-click="main.expandVault()"><i class="fa fa-external-link fa-rotate-270 fa-lg"></i></a>
     </div>
-    <div class="search" ng-style="{'visibility': disableSearch ? 'hidden' : 'visible'}">
-        <input type="search" placeholder="{{i18n.searchVault}}" ng-model="searchText" id="search" />
+    <div class="search" ng-style="{'visibility': main.disableSearch ? 'hidden' : 'visible'}">
+        <input type="search" placeholder="{{i18n.searchVault}}" id="search" ng-model="searchText" />
         <i class="fa fa-search"></i>
     </div>
     <div class="right">
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index 0b0bc29f86..49e631f5c2 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -54,6 +54,11 @@
             display: block;
             float: left;
         }
+
+        .fa-external-link {
+            vertical-align: 0;
+            margin: 0 -5px 0 5px;
+        }
     }
 
     .right {
@@ -117,11 +122,6 @@
             white-space: nowrap;
             float: none;
         }
-
-        .fa-external-link {
-            vertical-align: 0;
-            margin: 0 -5px 0 5px;
-        }
     }
 }