diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index 8f60d108f6..bbe9906ff4 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -68,8 +68,8 @@
                     </div>
                     <div class="box-content-row" appBoxRow>
                         <label for="loginTotp">{{'authenticatorKeyTotp' | i18n}}</label>
-                        <input id="loginTotp" type="text" name="Login.Totp" class="monospaced"
-                            [(ngModel)]="cipher.login.totp" appInputVerbatim>
+                        <input id="loginTotp" type="{{cipher.viewPassword ? 'text' : 'password'}}" name="Login.Totp"
+                            class="monospaced" [(ngModel)]="cipher.login.totp" appInputVerbatim [disabled]="!cipher.viewPassword">
                     </div>
                 </div>
                 <!-- Card -->
@@ -297,11 +297,13 @@
                                 *ngIf="f.type === fieldType.Text" placeholder="{{'value' | i18n}}" appInputVerbatim>
                             <input id="fieldValue{{i}}" type="{{f.showValue ? 'text' : 'password'}}"
                                 name="Field.Value{{i}}" [(ngModel)]="f.value" class="monospaced" appInputVerbatim
-                                *ngIf="f.type === fieldType.Hidden" placeholder="{{'value' | i18n}}">
+                                *ngIf="f.type === fieldType.Hidden" placeholder="{{'value' | i18n}}"
+                                [disabled]="!cipher.viewPassword && !f.newField">
                         </div>
                         <input id="fieldValue{{i}}" name="Field.Value{{i}}" type="checkbox" [(ngModel)]="f.value"
                             *ngIf="f.type === fieldType.Boolean" appTrueFalseValue trueValue="true" falseValue="false">
-                        <div class="action-buttons" *ngIf="f.type === fieldType.Hidden">
+                        <div class="action-buttons"
+                            *ngIf="f.type === fieldType.Hidden && (cipher.viewPassword || f.newField)">
                             <a class="row-btn" href="#" appStopClick appBlurClick
                                 appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleFieldValue(f)">
                                 <i class="fa fa-lg" aria-hidden="true"
diff --git a/src/popup/vault/view.component.html b/src/popup/vault/view.component.html
index f29c29df69..60014970f6 100644
--- a/src/popup/vault/view.component.html
+++ b/src/popup/vault/view.component.html
@@ -233,12 +233,12 @@
                 </div>
                 <div class="action-buttons">
                     <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
-                        *ngIf="field.type === fieldType.Hidden" (click)="toggleFieldValue(field)">
+                        *ngIf="field.type === fieldType.Hidden && cipher.viewPassword" (click)="toggleFieldValue(field)">
                         <i class="fa fa-lg" aria-hidden="true"
                             [ngClass]="{'fa-eye': !field.showValue, 'fa-eye-slash': field.showValue}"></i>
                     </a>
                     <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyValue' | i18n}}"
-                        *ngIf="field.value && field.type !== fieldType.Boolean"
+                        *ngIf="field.value && field.type !== fieldType.Boolean && !(field.type === fieldType.Hidden && !cipher.viewPassword)"
                         (click)="copy(field.value, 'value', field.type === fieldType.Hidden ? 'H_Field' : 'Field')">
                         <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>
                     </a>