diff --git a/src/popup/vault/add-edit-custom-fields.component.html b/src/popup/vault/add-edit-custom-fields.component.html
index 843fde75d0..4fe2eae422 100644
--- a/src/popup/vault/add-edit-custom-fields.component.html
+++ b/src/popup/vault/add-edit-custom-fields.component.html
@@ -8,9 +8,9 @@
             <div class="box-content-row box-content-row-multi box-draggable-row" appBoxRow cdkDrag
                 *ngFor="let f of cipher.fields; let i = index; trackBy:trackByFunction"
                 [ngClass]="{'box-content-row-checkbox': f.type === fieldType.Boolean}">
-                <a href="#" appStopClick (click)="removeField(f)" appA11yTitle="{{'remove' | i18n}}">
+                <button type="button" appStopClick (click)="removeField(f)" appA11yTitle="{{'remove' | i18n}}">
                     <i class="fa fa-minus-circle fa-lg" aria-hidden="true"></i>
-                </a>
+                </button>
                 <label for="fieldName{{i}}" class="sr-only">{{'name' | i18n}}</label>
                 <label for="fieldValue{{i}}" class="sr-only">{{'value' | i18n}}</label>
                 <div class="row-main">
@@ -28,11 +28,11 @@
                 <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 && (cipher.viewPassword || f.newField)">
-                    <a class="row-btn" href="#" appStopClick appBlurClick appA11yTitle="{{'toggleVisibility' | i18n}}"
+                    <button type="button" class="row-btn" appStopClick appBlurClick appA11yTitle="{{'toggleVisibility' | i18n}}"
                         (click)="toggleFieldValue(f)">
                         <i class="fa fa-lg" aria-hidden="true"
                             [ngClass]="{'fa-eye': !f.showValue, 'fa-eye-slash': f.showValue}"></i>
-                    </a>
+                    </button>
                 </div>
                 <div class="drag-handle" appA11yTitle="{{'dragToSort' | i18n}}" cdkDragHandle>
                     <i class="fa fa-bars" aria-hidden="true"></i>
@@ -41,9 +41,9 @@
         </div>
         <!-- Add new custom field -->
         <div class="box-content-row box-content-row-newmulti" appBoxRow>
-            <a href="#" appStopClick (click)="addField()">
+            <button type="button" appStopClick (click)="addField()">
                 <i class="fa fa-plus-circle fa-fw fa-lg" aria-hidden="true"></i> {{'newCustomField' | i18n}}
-            </a>
+            </button>
             <label for="addFieldType" class="sr-only">{{'type' | i18n}}</label>
             <select id="addFieldType" name="AddFieldType" [(ngModel)]="addFieldType" class="field-type">
                 <option *ngFor="let o of addFieldTypeOptions" [ngValue]="o.value">{{o.name}}</option>
diff --git a/src/popup/vault/view-custom-fields.component.html b/src/popup/vault/view-custom-fields.component.html
index 2987b4e130..8c3c1853b4 100644
--- a/src/popup/vault/view-custom-fields.component.html
+++ b/src/popup/vault/view-custom-fields.component.html
@@ -20,17 +20,17 @@
                 </div>
             </div>
             <div class="action-buttons">
-                <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
+                <button type="button" class="row-btn" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
                     *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}}"
+                </button>
+                <button type="button" class="row-btn" appStopClick appA11yTitle="{{'copyValue' | i18n}}"
                     *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-clone" aria-hidden="true"></i>
-                </a>
+                </button>
             </div>
         </div>
     </div>