diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index efb31e6b55a..88821529ee7 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -52,8 +52,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">
+                            <input id="loginTotp" type="{{cipher.viewPassword ? 'text' : 'password'}}" name="Login.Totp"
+                                class="monospaced" [(ngModel)]="cipher.login.totp" [disabled]="!cipher.viewPassword">
                         </div>
                     </div>
                     <!-- Card -->
@@ -281,12 +281,14 @@
                                     *ngIf="f.type === fieldType.Text" placeholder="{{'value' | i18n}}">
                                 <input id="fieldValue{{i}}" type="{{f.showValue ? 'text' : 'password'}}"
                                     name="Field.Value{{i}}" [(ngModel)]="f.value" class="monospaced"
-                                    *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 role="button"
                                     appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleFieldValue(f)">
                                     <i class="fa fa-lg" aria-hidden="true"
diff --git a/src/app/vault/view.component.html b/src/app/vault/view.component.html
index 28c3865d872..51fa879629b 100644
--- a/src/app/vault/view.component.html
+++ b/src/app/vault/view.component.html
@@ -221,12 +221,13 @@
                     </div>
                     <div class="action-buttons">
                         <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
-                            *ngIf="field.type === fieldType.Hidden" (click)="toggleFieldValue(field)" role="button">
+                            *ngIf="field.type === fieldType.Hidden && cipher.viewPassword"
+                            (click)="toggleFieldValue(field)" role="button">
                             <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')"
                             role="button">
                             <i class="fa fa-lg fa-clipboard" aria-hidden="true"></i>