diff --git a/src/popup/accounts/two-factor.component.html b/src/popup/accounts/two-factor.component.html
index 9a36f4edfe7..0ea74424e53 100644
--- a/src/popup/accounts/two-factor.component.html
+++ b/src/popup/accounts/two-factor.component.html
@@ -9,7 +9,8 @@
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading"
                     *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo &&
-                        selectedProviderType !== providerType.OrganizationDuo">
+                        selectedProviderType !== providerType.OrganizationDuo &&
+                        (selectedProviderType !== providerType.U2f || form.loading)">
                 <span [hidden]="form.loading">{{'continue' | i18n}}</span>
                 <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading"></i>
             </button>