diff --git a/src/popup/app/current/currentController.js b/src/popup/app/current/currentController.js
index fecaef4fef..19a519c980 100644
--- a/src/popup/app/current/currentController.js
+++ b/src/popup/app/current/currentController.js
@@ -79,7 +79,9 @@ angular
                 if (totpCode && utilsService.isFirefox()) {
                     utilsService.copyToClipboard(totpCode, document);
                 }
-                $window.close();
+                if (!utilsService.inSidebar($window)) {
+                    $window.close();
+                }
             }, function () {
                 $analytics.eventTrack('Autofilled Error');
                 toastr.error(i18nService.autofillError);
diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js
index 26eeda9c0e..005113da68 100644
--- a/src/popup/app/vault/vaultController.js
+++ b/src/popup/app/vault/vaultController.js
@@ -2,7 +2,7 @@
     .module('bit.vault')
 
     .controller('vaultController', function ($scope, $rootScope, loginService, folderService, $q, $state, $stateParams, toastr,
-        syncService, utilsService, $analytics, i18nService, stateService, $timeout) {
+        syncService, utilsService, $analytics, i18nService, stateService, $timeout, $window) {
         var stateKey = 'vault',
             state = stateService.getState(stateKey) || {};
 
@@ -178,6 +178,9 @@
                 if (login.uri.startsWith('http://') || login.uri.startsWith('https://')) {
                     $analytics.eventTrack('Launched Website From Listing');
                     chrome.tabs.create({ url: login.uri });
+                    if (!utilsService.inSidebar($window)) {
+                        $window.close();
+                    }
                 }
             });
         };
diff --git a/src/popup/app/vault/vaultViewFolderController.js b/src/popup/app/vault/vaultViewFolderController.js
index e8f9f16f8f..ece5ed6f05 100644
--- a/src/popup/app/vault/vaultViewFolderController.js
+++ b/src/popup/app/vault/vaultViewFolderController.js
@@ -2,7 +2,7 @@
     .module('bit.vault')
 
     .controller('vaultViewFolderController', function ($scope, loginService, folderService, $q, $state, $stateParams, toastr,
-        syncService, $analytics, i18nService, stateService, utilsService, $timeout) {
+        syncService, $analytics, i18nService, stateService, utilsService, $timeout, $window) {
         var stateKey = 'viewFolder',
             state = stateService.getState(stateKey) || {};
 
@@ -136,6 +136,9 @@
                 if (login.uri.startsWith('http://') || login.uri.startsWith('https://')) {
                     $analytics.eventTrack('Launched Website From Listing');
                     chrome.tabs.create({ url: login.uri });
+                    if (!utilsService.inSidebar($window)) {
+                        $window.close();
+                    }
                 }
             });
         };