diff --git a/src/popup/app/current/currentController.js b/src/popup/app/current/currentController.js
index e7f3dfff550..1d448b40534 100644
--- a/src/popup/app/current/currentController.js
+++ b/src/popup/app/current/currentController.js
@@ -14,6 +14,8 @@ angular
         $scope.otherCiphers = [];
         $scope.loaded = false;
         $scope.searchText = null;
+        $scope.inSidebar = utilsService.inSidebar($window);
+        $scope.disableSearch = utilsService.isEdge();
         document.getElementById('search').focus();
 
         $scope.$on('$viewContentLoaded', function () {
diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index 0a00dd65314..8c39fcde231 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -1,11 +1,11 @@
 <div class="header header-search">
-    <div class="left" ng-if="!main.inSidebar">
+    <div class="left" ng-if="!inSidebar">
         <pop-out></pop-out>
     </div>
-    <div class="left" ng-if="main.inSidebar">
+    <div class="left" ng-if="inSidebar">
         <a href="" ng-click="refresh()"><i class="fa fa-refresh fa-lg"></i></a>
     </div>
-    <div class="search" ng-style="{'visibility': main.disableSearch ? 'hidden' : 'visible'}">
+    <div class="search" ng-style="{'visibility': disableSearch ? 'hidden' : 'visible'}">
         <input type="search" placeholder="{{i18n.searchVault}}" id="search" ng-model="searchText" ng-change="searchVault()" />
         <i class="fa fa-search"></i>
     </div>
diff --git a/src/popup/app/global/mainController.js b/src/popup/app/global/mainController.js
index 37466b76f20..279918b66f9 100644
--- a/src/popup/app/global/mainController.js
+++ b/src/popup/app/global/mainController.js
@@ -7,8 +7,6 @@ angular
         self.animation = '';
         self.xsBody = $window.screen.availHeight < 600;
         self.smBody = !self.xsBody && $window.screen.availHeight <= 800;
-        self.disableSearch = utilsService && utilsService.isEdge();
-        self.inSidebar = utilsService && utilsService.inSidebar($window);
 
         $transitions.onSuccess({}, function(transition) {
             const toParams = transition.params("to");
diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js
index e0e2387f6b2..654f5a652a7 100644
--- a/src/popup/app/vault/vaultController.js
+++ b/src/popup/app/vault/vaultController.js
@@ -9,6 +9,7 @@ angular
         $scope.i18n = i18nService;
         $scope.showFolderCounts = !utilsService.isEdge();
         $scope.showOnlyFolderView = utilsService.isEdge();
+        $scope.disableSearch = utilsService.isEdge();
         document.getElementById('search').focus();
 
         var syncOnLoad = $stateParams.syncOnLoad;
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index a9f2c490457..f7cdcca8439 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -2,7 +2,7 @@
     <div class="left">
         <pop-out></pop-out>
     </div>
-    <div class="search" ng-style="{'visibility': main.disableSearch ? 'hidden' : 'visible'}">
+    <div class="search" ng-style="{'visibility': disableSearch ? 'hidden' : 'visible'}">
         <input type="search" placeholder="{{::i18n.searchVault}}" id="search" ng-model="searchText" />
         <i class="fa fa-search"></i>
     </div>