diff --git a/src/popup/app/tools/tools.component.ts b/src/popup/app/tools/tools.component.ts
index 79910a51395..c556f2f25f1 100644
--- a/src/popup/app/tools/tools.component.ts
+++ b/src/popup/app/tools/tools.component.ts
@@ -7,14 +7,21 @@ export class ToolsController {
     i18n: any;
 
     constructor(private SweetAlert: any, private i18nService: any,
-                private $analytics: any, private utilsService: UtilsService) {
+                private $analytics: any, private utilsService: UtilsService,
+                private webVaultBaseUrl: string = 'https://vault.bitwarden.com',
+                private environmentService: any) {
         this.i18n = i18nService;
         this.showExport = !utilsService.isEdge();
+        if (environmentService.baseUrl) {
+            this.webVaultBaseUrl = environmentService.baseUrl;
+        } else if (environmentService.webVaultUrl) {
+            this.webVaultBaseUrl = environmentService.webVaultUrl;
+        }
     }
 
     launchWebVault(createOrg: any) {
         this.$analytics.eventTrack('Launch Web Vault' + (createOrg ? ' For Share' : ''));
-        chrome.tabs.create({ url: 'https://vault.bitwarden.com/#/' + (createOrg ? '?org=free' : '') });
+        chrome.tabs.create({ url: this.webVaultBaseUrl + '/#/' + (createOrg ? '?org=free' : '') });
     }
 
     launchAndroid() {