diff --git a/src/browser/browserApi.ts b/src/browser/browserApi.ts
index d931e62ce76..a82584c71dc 100644
--- a/src/browser/browserApi.ts
+++ b/src/browser/browserApi.ts
@@ -1,6 +1,7 @@
 class BrowserApi {
-    static isSafariApi: boolean = (typeof safari !== 'undefined');
-    static isChromeApi: boolean = (typeof chrome !== 'undefined');
+    static isSafariApi: boolean = (typeof safari !== 'undefined') &&
+        navigator.userAgent.indexOf(' Safari/') !== -1 && navigator.userAgent.indexOf('Chrome') === -1;
+    static isChromeApi: boolean = !BrowserApi.isSafariApi && (typeof chrome !== 'undefined');
 
     static async getTabFromCurrentWindowId(): Promise<any> {
         if (BrowserApi.isChromeApi) {
diff --git a/src/popup/app/tools/export.component.ts b/src/popup/app/tools/export.component.ts
index f7e59ceac0a..1f4ed0cdec5 100644
--- a/src/popup/app/tools/export.component.ts
+++ b/src/popup/app/tools/export.component.ts
@@ -42,6 +42,7 @@ export class ExportController {
             const csv = await this.getCsv();
             this.$analytics.eventTrack('Exported Data');
             this.downloadFile(csv);
+            this.$state.go('tabs.tools', { animation: 'out-slide-down' });
         } else {
             this.toastr.error(this.i18n.invalidMasterPassword, this.i18n.errorsOccurred);
         }