diff --git a/src/background/main.background.ts b/src/background/main.background.ts
index 890fea89dc..4b79d337f3 100644
--- a/src/background/main.background.ts
+++ b/src/background/main.background.ts
@@ -577,7 +577,7 @@ export default class MainBackground {
             });
         }
 
-        if (cipher == null || (cipher.login.password && cipher.login.password !== '')) {
+        if (cipher == null || (cipher.login.password && cipher.login.password !== '' && cipher.viewPassword)) {
             await this.contextMenusCreate({
                 type: 'normal',
                 id: 'copy-password_' + idSuffix,
diff --git a/src/popup/components/action-buttons.component.html b/src/popup/components/action-buttons.component.html
index 276666fb97..54039a3057 100644
--- a/src/popup/components/action-buttons.component.html
+++ b/src/popup/components/action-buttons.component.html
@@ -13,7 +13,7 @@
     </span>
     <span class="row-btn" appStopClick appStopProp appA11yTitle="{{'copyPassword' | i18n}}"
         (click)="copy(cipher, cipher.login.password, 'password', 'Password')"
-        [ngClass]="{disabled: !cipher.login.password}">
+        [ngClass]="{disabled: (!cipher.login.password || !cipher.viewPassword)}">
         <i class="fa fa-lg fa-key" aria-hidden="true"></i>
     </span>
 </ng-container>
diff --git a/src/popup/components/action-buttons.component.ts b/src/popup/components/action-buttons.component.ts
index 0401b41e33..4158564b5e 100644
--- a/src/popup/components/action-buttons.component.ts
+++ b/src/popup/components/action-buttons.component.ts
@@ -53,6 +53,10 @@ export class ActionButtonsComponent {
             return;
         }
 
+        if (!cipher.viewPassword) {
+            return;
+        }
+
         this.analytics.eventTrack.next({ action: 'Copied ' + aType });
         this.platformUtilsService.copyToClipboard(value, { window: window });
         this.toasterService.popAsync('info', null,
diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index bd11fca90e..8f60d108f6 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -40,24 +40,28 @@
                         <div class="row-main">
                             <label for="loginPassword">{{'password' | i18n}}</label>
                             <input id="loginPassword" class="monospaced" type="{{showPassword ? 'text' : 'password'}}"
-                                name="Login.Password" [(ngModel)]="cipher.login.password" appInputVerbatim>
+                                name="Login.Password" [(ngModel)]="cipher.login.password" appInputVerbatim
+                                [disabled]="!cipher.viewPassword">
                         </div>
                         <div class="action-buttons">
                             <button type="button" #checkPasswordBtn class="row-btn btn" appBlurClick
                                 appA11yTitle="{{'checkPassword' | i18n}}" (click)="checkPassword()"
-                                [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">
+                                [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading"
+                                *ngIf="cipher.viewPassword">
                                 <i class="fa fa-lg fa-check-circle" [hidden]="checkPasswordBtn.loading"
                                     aria-hidden="true"></i>
                                 <i class="fa fa-lg fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"
                                     aria-hidden="true"></i>
                             </button>
                             <a class="row-btn" href="#" appStopClick appBlurClick
-                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                                appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()"
+                                *ngIf="cipher.viewPassword">
                                 <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </a>
                             <a class="row-btn" href="#" appStopClick appBlurClick
-                                appA11yTitle="{{'generatePassword' | i18n}}" (click)="generatePassword()">
+                                appA11yTitle="{{'generatePassword' | i18n}}" (click)="generatePassword()"
+                                *ngIf="cipher.viewPassword">
                                 <i class="fa fa-lg fa-refresh" aria-hidden="true"></i>
                             </a>
                         </div>
diff --git a/src/popup/vault/view.component.html b/src/popup/vault/view.component.html
index 8b989c4c6a..f29c29df69 100644
--- a/src/popup/vault/view.component.html
+++ b/src/popup/vault/view.component.html
@@ -46,19 +46,21 @@
                     <div class="action-buttons">
                         <button type="button" #checkPasswordBtn class="row-btn btn" appBlurClick
                             appA11yTitle="{{'checkPassword' | i18n}}" (click)="checkPassword()"
-                            [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">
+                            [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading"
+                            *ngIf="cipher.viewPassword">
                             <i class="fa fa-lg fa-check-circle" [hidden]="checkPasswordBtn.loading"
                                 aria-hidden="true"></i>
                             <i class="fa fa-lg fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"
                                 aria-hidden="true"></i>
                         </button>
                         <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
-                            (click)="togglePassword()">
+                            (click)="togglePassword()" *ngIf="cipher.viewPassword">
                             <i class="fa fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                         </a>
                         <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyPassword' | i18n}}"
-                            (click)="copy(cipher.login.password, 'password', 'Password')">
+                            (click)="copy(cipher.login.password, 'password', 'Password')"
+                            *ngIf="cipher.viewPassword">
                             <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                         </a>
                     </div>