diff --git a/src/popup/app.component.ts b/src/popup/app.component.ts
index d2578f181a..2efe175723 100644
--- a/src/popup/app.component.ts
+++ b/src/popup/app.component.ts
@@ -129,7 +129,7 @@ export class AppComponent implements OnInit {
                 }
             } else if (msg.command === 'reloadPopup') {
                 this.ngZone.run(() => {
-                    this.router.navigate(['/', { queryParams: { reload: true } }]);
+                    this.router.navigate(['/']);
                 });
             } else {
                 msg.webExtSender = sender;
diff --git a/src/safari/app/desktop/safari/SafariExtensionViewController.swift b/src/safari/app/desktop/safari/SafariExtensionViewController.swift
index f69a6f4468..f8a86094ad 100644
--- a/src/safari/app/desktop/safari/SafariExtensionViewController.swift
+++ b/src/safari/app/desktop/safari/SafariExtensionViewController.swift
@@ -139,6 +139,8 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
                             }
                         }
                     }
+                } else if command == "hideWindow" {
+                    dismissPopover()
                 }
             }
         }