diff --git a/jslib b/jslib
index a85c45a34ed..ee1ea922a9d 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit a85c45a34ed90b09f59ec27bdba754d66452915e
+Subproject commit ee1ea922a9d5a51ef8df2abf4b97fc035ed782be
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 1a3296d2e15..044301571fa 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1764,7 +1764,7 @@
   },
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  }, 
+  },
   "resetPasswordPolicyAutoEnroll": {
     "message": "Automatic Enrollment"
   },
@@ -1798,5 +1798,11 @@
   },
   "vaultTimeoutToLarge": {
     "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "vaultExportDisabled": {
+    "message": "Vault Export Disabled"
+  },
+  "personalVaultExportPolicyInEffect": {
+    "message": "One or more organization policies prevents you from exporting your personal vault."
   }
 }
diff --git a/src/content/contextMenuHandler.ts b/src/content/contextMenuHandler.ts
index 6aae8ca1686..e4be3aa1a80 100644
--- a/src/content/contextMenuHandler.ts
+++ b/src/content/contextMenuHandler.ts
@@ -5,7 +5,7 @@ let clickedEl: HTMLElement = null;
 // Find the best attribute to be used as the Name for an element in a custom field.
 function getClickedElementIdentifier() {
     if (clickedEl == null) {
-        return 'Unable to identify clicked element.'
+        return 'Unable to identify clicked element.';
     }
 
     if (!inputTags.includes(clickedEl.nodeName.toLowerCase())) {
diff --git a/src/popup/settings/export.component.html b/src/popup/settings/export.component.html
index 759fbec53ce..27d42cdf56b 100644
--- a/src/popup/settings/export.component.html
+++ b/src/popup/settings/export.component.html
@@ -10,15 +10,19 @@
             <span class="title">{{'exportVault' | i18n}}</span>
         </div>
         <div class="right">
-            <button appBlurClick type="submit">{{'submit' | i18n}}</button>
+            <button appBlurClick type="submit" [disabled]="disabledByPolicy">{{'submit' | i18n}}</button>
         </div>
     </header>
     <content>
+        <app-callout type="warning" title="{{'vaultExportDisabled' | i18n}}" *ngIf="disabledByPolicy">
+            {{'personalVaultExportPolicyInEffect' | i18n}}
+        </app-callout>
+
         <div class="box">
             <div class="box-content">
                 <div class="box-content-row" appBoxRow>
                     <label for="format">{{'fileFormat' | i18n}}</label>
-                    <select id="format" name="Format" [(ngModel)]="format">
+                    <select id="format" name="Format" [(ngModel)]="format" [disabled]="disabledByPolicy">
                         <option value="json">.json</option>
                         <option value="csv">.csv</option>
                         <option value="encrypted_json">.json (Encrypted)</option>
@@ -28,7 +32,8 @@
                     <div class="row-main">
                         <label for="masterPassword">{{'masterPass' | i18n}}</label>
                         <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword"
-                            class="monospaced" [(ngModel)]="masterPassword" required appInputVerbatim appAutofocus>
+                            class="monospaced" [(ngModel)]="masterPassword" required appInputVerbatim appAutofocus
+                            [disabled]="disabledByPolicy">
                     </div>
                     <div class="action-buttons">
                         <a class="row-btn" href="#" appStopClick appBlurClick
diff --git a/src/popup/settings/export.component.ts b/src/popup/settings/export.component.ts
index 4dec532bd9e..67a5f804a90 100644
--- a/src/popup/settings/export.component.ts
+++ b/src/popup/settings/export.component.ts
@@ -6,6 +6,7 @@ import { EventService } from 'jslib-common/abstractions/event.service';
 import { ExportService } from 'jslib-common/abstractions/export.service';
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
+import { PolicyService } from 'jslib-common/abstractions/policy.service';
 
 import { ExportComponent as BaseExportComponent } from 'jslib-angular/components/export.component';
 
@@ -16,8 +17,8 @@ import { ExportComponent as BaseExportComponent } from 'jslib-angular/components
 export class ExportComponent extends BaseExportComponent {
     constructor(cryptoService: CryptoService, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, exportService: ExportService,
-        eventService: EventService, private router: Router) {
-        super(cryptoService, i18nService, platformUtilsService, exportService, eventService, window);
+        eventService: EventService, policyService: PolicyService, private router: Router) {
+        super(cryptoService, i18nService, platformUtilsService, exportService, eventService, policyService, window);
     }
 
     protected saved() {