diff --git a/jslib b/jslib
index 013bf20a35..fd19efa9f2 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 013bf20a35c74383389337ac2c5ae9ac19a0bba7
+Subproject commit fd19efa9f260addca1f0fc14dd1641a276a22759
diff --git a/src/popup2/accounts/two-factor.component.html b/src/popup2/accounts/two-factor.component.html
index 4ce0377eeb..f353552728 100644
--- a/src/popup2/accounts/two-factor.component.html
+++ b/src/popup2/accounts/two-factor.component.html
@@ -75,7 +75,10 @@
     </ng-container>
     <ng-container *ngIf="selectedProviderType === providerType.Duo ||
                         selectedProviderType === providerType.OrganizationDuo">
-        <div id="duo-frame"><iframe id="duo_iframe"></iframe></div>
+        <div id="duo-frame" *ngIf="!showNewWindowMessage"><iframe id="duo_iframe"></iframe></div>
+        <div *ngIf="showNewWindowMessage" class="content no-vpad text-center">
+            {{'twoStepNewWindowMessage' | i18n}}
+        </div>
         <div class="box">
             <div class="box-content">
                 <div class="box-content-row box-content-row-checkbox" appBoxRow>
diff --git a/src/popup2/accounts/two-factor.component.ts b/src/popup2/accounts/two-factor.component.ts
index b01047b8fc..a39b98e947 100644
--- a/src/popup2/accounts/two-factor.component.ts
+++ b/src/popup2/accounts/two-factor.component.ts
@@ -7,6 +7,10 @@ import { Router } from '@angular/router';
 import { ToasterService } from 'angular2-toaster';
 import { Angulartics2 } from 'angulartics2';
 
+import { BrowserApi } from '../../browser/browserApi';
+
+import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType';
+
 import { ApiService } from 'jslib/abstractions/api.service';
 import { AuthService } from 'jslib/abstractions/auth.service';
 import { EnvironmentService } from 'jslib/abstractions/environment.service';
@@ -21,6 +25,8 @@ import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib/angular/comp
     template: template,
 })
 export class TwoFactorComponent extends BaseTwoFactorComponent {
+    showNewWindowMessage = false;
+
     constructor(authService: AuthService, router: Router,
         analytics: Angulartics2, toasterService: ToasterService,
         i18nService: I18nService, apiService: ApiService,
@@ -30,6 +36,37 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
             platformUtilsService, syncService, window, environmentService);
     }
 
+    async ngOnInit() {
+        this.showNewWindowMessage = this.platformUtilsService.isSafari();
+        await super.ngOnInit();
+
+        if (this.selectedProviderType == null) {
+            return;
+        }
+
+        var isDuo = this.selectedProviderType == TwoFactorProviderType.Duo ||
+            this.selectedProviderType == TwoFactorProviderType.OrganizationDuo;
+        if (!this.platformUtilsService.isSafari() || !isDuo) {
+            return;
+        }
+
+        const params = this.authService.twoFactorProviders.get(this.selectedProviderType);
+        const tab = BrowserApi.createNewTab(BrowserApi.getAssetUrl('2fa/index.html'));
+        const tabToSend = BrowserApi.makeTabObject(tab);
+        window.setTimeout(() => {
+            BrowserApi.tabSendMessage(tabToSend, {
+                command: '2faPageData',
+                data: {
+                    type: 'duo',
+                    host: params.Host,
+                    signature: params.Signature,
+                }
+            });
+        }, 500);
+
+        // TODO: listen for duo data message response
+    }
+
     anotherMethod() {
         this.router.navigate(['2fa-options']);
     }