diff --git a/dist/autofill-debug.js b/dist/autofill-debug.js
index 042e81694..6a9fbe5cd 100644
--- a/dist/autofill-debug.js
+++ b/dist/autofill-debug.js
@@ -16581,25 +16581,27 @@ class HTMLTooltipUIController extends _UIController.UIController {
 
   /**
    * Called when clicking on the Manage… button in the html tooltip
-   *
    * @param {SupportedMainTypes} type
    * @returns {*}
    * @private
    */
   _onManage(type) {
-    this.removeTooltip();
     switch (type) {
       case 'credentials':
-        return this._options.device.openManagePasswords();
+        this._options.device.openManagePasswords();
+        break;
       case 'creditCards':
-        return this._options.device.openManageCreditCards();
+        this._options.device.openManageCreditCards();
+        break;
       case 'identities':
-        return this._options.device.openManageIdentities();
+        this._options.device.openManageIdentities();
+        break;
       default:
       // noop
     }
-  }
 
+    this.removeTooltip();
+  }
   _onIncontextSignupDismissed(_ref) {
     let {
       hasOtherOptions
diff --git a/dist/autofill.js b/dist/autofill.js
index fd485bd79..04931d74e 100644
--- a/dist/autofill.js
+++ b/dist/autofill.js
@@ -12218,25 +12218,27 @@ class HTMLTooltipUIController extends _UIController.UIController {
 
   /**
    * Called when clicking on the Manage… button in the html tooltip
-   *
    * @param {SupportedMainTypes} type
    * @returns {*}
    * @private
    */
   _onManage(type) {
-    this.removeTooltip();
     switch (type) {
       case 'credentials':
-        return this._options.device.openManagePasswords();
+        this._options.device.openManagePasswords();
+        break;
       case 'creditCards':
-        return this._options.device.openManageCreditCards();
+        this._options.device.openManageCreditCards();
+        break;
       case 'identities':
-        return this._options.device.openManageIdentities();
+        this._options.device.openManageIdentities();
+        break;
       default:
       // noop
     }
-  }
 
+    this.removeTooltip();
+  }
   _onIncontextSignupDismissed(_ref) {
     let {
       hasOtherOptions
diff --git a/src/UI/controllers/HTMLTooltipUIController.js b/src/UI/controllers/HTMLTooltipUIController.js
index a239621b5..12aaed41e 100644
--- a/src/UI/controllers/HTMLTooltipUIController.js
+++ b/src/UI/controllers/HTMLTooltipUIController.js
@@ -328,23 +328,25 @@ export class HTMLTooltipUIController extends UIController {
 
     /**
      * Called when clicking on the Manage… button in the html tooltip
-     *
      * @param {SupportedMainTypes} type
      * @returns {*}
      * @private
      */
     _onManage(type) {
-        this.removeTooltip();
         switch (type) {
             case 'credentials':
-                return this._options.device.openManagePasswords();
+                this._options.device.openManagePasswords();
+                break;
             case 'creditCards':
-                return this._options.device.openManageCreditCards();
+                this._options.device.openManageCreditCards();
+                break;
             case 'identities':
-                return this._options.device.openManageIdentities();
+                this._options.device.openManageIdentities();
+                break;
             default:
             // noop
         }
+        this.removeTooltip();
     }
 
     _onIncontextSignupDismissed({ hasOtherOptions }) {
diff --git a/swift-package/Resources/assets/autofill-debug.js b/swift-package/Resources/assets/autofill-debug.js
index 042e81694..6a9fbe5cd 100644
--- a/swift-package/Resources/assets/autofill-debug.js
+++ b/swift-package/Resources/assets/autofill-debug.js
@@ -16581,25 +16581,27 @@ class HTMLTooltipUIController extends _UIController.UIController {
 
   /**
    * Called when clicking on the Manage… button in the html tooltip
-   *
    * @param {SupportedMainTypes} type
    * @returns {*}
    * @private
    */
   _onManage(type) {
-    this.removeTooltip();
     switch (type) {
       case 'credentials':
-        return this._options.device.openManagePasswords();
+        this._options.device.openManagePasswords();
+        break;
       case 'creditCards':
-        return this._options.device.openManageCreditCards();
+        this._options.device.openManageCreditCards();
+        break;
       case 'identities':
-        return this._options.device.openManageIdentities();
+        this._options.device.openManageIdentities();
+        break;
       default:
       // noop
     }
-  }
 
+    this.removeTooltip();
+  }
   _onIncontextSignupDismissed(_ref) {
     let {
       hasOtherOptions
diff --git a/swift-package/Resources/assets/autofill.js b/swift-package/Resources/assets/autofill.js
index fd485bd79..04931d74e 100644
--- a/swift-package/Resources/assets/autofill.js
+++ b/swift-package/Resources/assets/autofill.js
@@ -12218,25 +12218,27 @@ class HTMLTooltipUIController extends _UIController.UIController {
 
   /**
    * Called when clicking on the Manage… button in the html tooltip
-   *
    * @param {SupportedMainTypes} type
    * @returns {*}
    * @private
    */
   _onManage(type) {
-    this.removeTooltip();
     switch (type) {
       case 'credentials':
-        return this._options.device.openManagePasswords();
+        this._options.device.openManagePasswords();
+        break;
       case 'creditCards':
-        return this._options.device.openManageCreditCards();
+        this._options.device.openManageCreditCards();
+        break;
       case 'identities':
-        return this._options.device.openManageIdentities();
+        this._options.device.openManageIdentities();
+        break;
       default:
       // noop
     }
-  }
 
+    this.removeTooltip();
+  }
   _onIncontextSignupDismissed(_ref) {
     let {
       hasOtherOptions