diff --git a/src/notification/bar.html b/src/notification/bar.html
index 5e8962c1a59..bc43ed7cc86 100644
--- a/src/notification/bar.html
+++ b/src/notification/bar.html
@@ -24,15 +24,15 @@
         <div class="inner-wrapper" id="template-add">
             <div class="add-text"></div>
             <div class="add-buttons">
-                <button class="never-save link"></button>
+                <button type="button" class="never-save link"></button>
                 <select class="select-folder"></select>
-                <button class="add-save"></button>
+                <button type="button" class="add-save"></button>
             </div>
         </div>
         <div class="inner-wrapper" id="template-change">
             <div class="change-text"></div>
             <div class="change-buttons">
-                <button class="change-save"></button>
+                <button type="button" class="change-save"></button>
             </div>
         </div>
     </div>
diff --git a/src/popup/accounts/update-temp-password.component.html b/src/popup/accounts/update-temp-password.component.html
index 608e7214c8f..19e698b8f5c 100644
--- a/src/popup/accounts/update-temp-password.component.html
+++ b/src/popup/accounts/update-temp-password.component.html
@@ -36,7 +36,7 @@
                                 appInputVerbatim (input)="updatePasswordStrength()">
                         </div>
                         <div class="action-buttons">
-                            <button class="row-btn" appStopClick appBlurClick
+                            <button type="button" class="row-btn" appStopClick appBlurClick
                                 appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)">
                                 <i class="fa fa-lg" aria-hidden="true"
                                     [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
@@ -62,7 +62,7 @@
                             appInputVerbatim>
                     </div>
                     <div class="action-buttons">
-                        <button class="row-btn" appStopClick appBlurClick
+                        <button type="button" class="row-btn" appStopClick appBlurClick
                             appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
                             <i class="fa fa-lg" aria-hidden="true"
                                 [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
diff --git a/src/popup/components/cipher-row.component.html b/src/popup/components/cipher-row.component.html
index 91aa472d422..1772566db9b 100644
--- a/src/popup/components/cipher-row.component.html
+++ b/src/popup/components/cipher-row.component.html
@@ -1,4 +1,4 @@
-<button (click)="selectCipher(cipher)" (dblclick)="launchCipher(cipher)" appStopClick
+<button type="button" (click)="selectCipher(cipher)" (dblclick)="launchCipher(cipher)" appStopClick
     title="{{title}} - {{cipher.name}}" class="box-content-row box-content-row-flex virtual-scroll-item">
     <div class="row-main">
         <app-vault-icon [cipher]="cipher"></app-vault-icon>
diff --git a/src/popup/components/password-reprompt.component.html b/src/popup/components/password-reprompt.component.html
index 24354cb16ed..fd41a1a5b4e 100644
--- a/src/popup/components/password-reprompt.component.html
+++ b/src/popup/components/password-reprompt.component.html
@@ -12,7 +12,7 @@
                                     class="monospaced" [(ngModel)]="masterPassword" required appAutofocus>
                             </div>
                             <div class="action-buttons">
-                                <button class="row-btn" appStopClick appBlurClick role="button"
+                                <button type="button" class="row-btn" appStopClick appBlurClick role="button"
                                     appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
                                     <i class="fa fa-lg" aria-hidden="true"
                                         [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
diff --git a/src/popup/components/set-pin.component.html b/src/popup/components/set-pin.component.html
index c9a0126a8a8..e82f1d60c3d 100644
--- a/src/popup/components/set-pin.component.html
+++ b/src/popup/components/set-pin.component.html
@@ -14,7 +14,7 @@
                                     class="monospaced" [(ngModel)]="pin" required appInputVerbatim cdkFocusInitial>
                             </div>
                             <div class="action-buttons">
-                                <button class="row-btn" appStopClick appBlurClick appA11yTitle="{{'toggleVisibility' | i18n}}"
+                                <button type="button" class="row-btn" appStopClick appBlurClick appA11yTitle="{{'toggleVisibility' | i18n}}"
                                     (click)="toggleVisibility()">
                                     <i class="fa fa-lg" aria-hidden="true"
                                         [ngClass]="{'fa-eye': !showPin, 'fa-eye-slash': showPin}"></i>