diff --git a/apps/web/src/app/auth/settings/two-factor-authenticator.component.html b/apps/web/src/app/auth/settings/two-factor-authenticator.component.html
index 59733c0a15..a7efaed731 100644
--- a/apps/web/src/app/auth/settings/two-factor-authenticator.component.html
+++ b/apps/web/src/app/auth/settings/two-factor-authenticator.component.html
@@ -72,7 +72,7 @@
       <button bitButton bitFormButton type="submit" buttonType="primary">
         {{ (enabled ? "disable" : "enable") | i18n }}
       </button>
-      <button bitButton bitFormButton type="button" buttonType="secondary" [bitAction]="onClose">
+      <button bitButton bitFormButton type="button" buttonType="secondary" [bitAction]="close">
         {{ "close" | i18n }}
       </button>
     </ng-container>
diff --git a/apps/web/src/app/auth/settings/two-factor-authenticator.component.ts b/apps/web/src/app/auth/settings/two-factor-authenticator.component.ts
index 830ec3a816..c333e60f9f 100644
--- a/apps/web/src/app/auth/settings/two-factor-authenticator.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor-authenticator.component.ts
@@ -92,6 +92,7 @@ export class TwoFactorAuthenticatorComponent
   submit = async () => {
     if (this.enabled) {
       await this.disableAuthentication(this.formPromise);
+      this.close();
     } else {
       await this.enable();
     }
@@ -134,7 +135,7 @@ export class TwoFactorAuthenticatorComponent
     }, 100);
   }
 
-  onClose = () => {
+  close = () => {
     this.dialogRef.close(this.enabled);
   };