diff --git a/dist/autofill-debug.js b/dist/autofill-debug.js
index 042e81694..5353e6e39 100644
--- a/dist/autofill-debug.js
+++ b/dist/autofill-debug.js
@@ -8212,6 +8212,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing passwords
    */
   openManagePasswords() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManagePasswords'));
   }
 
@@ -8219,6 +8220,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing identities
    */
   openManageIdentities() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManageIdentities'));
   }
 
@@ -8226,6 +8228,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing credit cards
    */
   openManageCreditCards() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManageCreditCards'));
   }
 
@@ -9775,19 +9778,22 @@ class WindowsOverlayDeviceInterface extends _InterfacePrototype.default {
    * @returns {Promise<any>}
    */
   openManagePasswords() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManagePasswordsCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManagePasswordsCall({}));
+    return this._closeAutofillParent();
   }
   /**
    * @returns {Promise<any>}
    */
   openManageCreditCards() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManageCreditCardsCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManageCreditCardsCall({}));
+    return this._closeAutofillParent();
   }
   /**
    * @returns {Promise<any>}
    */
   openManageIdentities() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManageIdentitiesCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManageIdentitiesCall({}));
+    return this._closeAutofillParent();
   }
 
   /**
@@ -16587,7 +16593,6 @@ class HTMLTooltipUIController extends _UIController.UIController {
    * @private
    */
   _onManage(type) {
-    this.removeTooltip();
     switch (type) {
       case 'credentials':
         return this._options.device.openManagePasswords();
diff --git a/dist/autofill.js b/dist/autofill.js
index fd485bd79..533aa3862 100644
--- a/dist/autofill.js
+++ b/dist/autofill.js
@@ -3849,6 +3849,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing passwords
    */
   openManagePasswords() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManagePasswords'));
   }
 
@@ -3856,6 +3857,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing identities
    */
   openManageIdentities() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManageIdentities'));
   }
 
@@ -3863,6 +3865,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing credit cards
    */
   openManageCreditCards() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManageCreditCards'));
   }
 
@@ -5412,19 +5415,22 @@ class WindowsOverlayDeviceInterface extends _InterfacePrototype.default {
    * @returns {Promise<any>}
    */
   openManagePasswords() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManagePasswordsCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManagePasswordsCall({}));
+    return this._closeAutofillParent();
   }
   /**
    * @returns {Promise<any>}
    */
   openManageCreditCards() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManageCreditCardsCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManageCreditCardsCall({}));
+    return this._closeAutofillParent();
   }
   /**
    * @returns {Promise<any>}
    */
   openManageIdentities() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManageIdentitiesCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManageIdentitiesCall({}));
+    return this._closeAutofillParent();
   }
 
   /**
@@ -12224,7 +12230,6 @@ class HTMLTooltipUIController extends _UIController.UIController {
    * @private
    */
   _onManage(type) {
-    this.removeTooltip();
     switch (type) {
       case 'credentials':
         return this._options.device.openManagePasswords();
diff --git a/src/DeviceInterface/AppleDeviceInterface.js b/src/DeviceInterface/AppleDeviceInterface.js
index d2326a2e8..daf166f78 100644
--- a/src/DeviceInterface/AppleDeviceInterface.js
+++ b/src/DeviceInterface/AppleDeviceInterface.js
@@ -217,6 +217,7 @@ class AppleDeviceInterface extends InterfacePrototype {
      * Opens the native UI for managing passwords
      */
     openManagePasswords() {
+        this._closeAutofillParent();
         return this.deviceApi.notify(createNotification('pmHandlerOpenManagePasswords'));
     }
 
@@ -224,6 +225,7 @@ class AppleDeviceInterface extends InterfacePrototype {
      * Opens the native UI for managing identities
      */
     openManageIdentities() {
+        this._closeAutofillParent();
         return this.deviceApi.notify(createNotification('pmHandlerOpenManageIdentities'));
     }
 
@@ -231,6 +233,7 @@ class AppleDeviceInterface extends InterfacePrototype {
      * Opens the native UI for managing credit cards
      */
     openManageCreditCards() {
+        this._closeAutofillParent();
         return this.deviceApi.notify(createNotification('pmHandlerOpenManageCreditCards'));
     }
 
diff --git a/src/DeviceInterface/WindowsOverlayDeviceInterface.js b/src/DeviceInterface/WindowsOverlayDeviceInterface.js
index 0104bf822..affee4b46 100644
--- a/src/DeviceInterface/WindowsOverlayDeviceInterface.js
+++ b/src/DeviceInterface/WindowsOverlayDeviceInterface.js
@@ -102,19 +102,22 @@ export class WindowsOverlayDeviceInterface extends InterfacePrototype {
      * @returns {Promise<any>}
      */
     openManagePasswords() {
-        return this.deviceApi.notify(new OpenManagePasswordsCall({}));
+        this.deviceApi.notify(new OpenManagePasswordsCall({}));
+        return this._closeAutofillParent();
     }
     /**
      * @returns {Promise<any>}
      */
     openManageCreditCards() {
-        return this.deviceApi.notify(new OpenManageCreditCardsCall({}));
+        this.deviceApi.notify(new OpenManageCreditCardsCall({}));
+        return this._closeAutofillParent();
     }
     /**
      * @returns {Promise<any>}
      */
     openManageIdentities() {
-        return this.deviceApi.notify(new OpenManageIdentitiesCall({}));
+        this.deviceApi.notify(new OpenManageIdentitiesCall({}));
+        return this._closeAutofillParent();
     }
 
     /**
diff --git a/src/UI/controllers/HTMLTooltipUIController.js b/src/UI/controllers/HTMLTooltipUIController.js
index a239621b5..f49ad9641 100644
--- a/src/UI/controllers/HTMLTooltipUIController.js
+++ b/src/UI/controllers/HTMLTooltipUIController.js
@@ -334,7 +334,6 @@ export class HTMLTooltipUIController extends UIController {
      * @private
      */
     _onManage(type) {
-        this.removeTooltip();
         switch (type) {
             case 'credentials':
                 return this._options.device.openManagePasswords();
diff --git a/swift-package/Resources/assets/autofill-debug.js b/swift-package/Resources/assets/autofill-debug.js
index 042e81694..5353e6e39 100644
--- a/swift-package/Resources/assets/autofill-debug.js
+++ b/swift-package/Resources/assets/autofill-debug.js
@@ -8212,6 +8212,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing passwords
    */
   openManagePasswords() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManagePasswords'));
   }
 
@@ -8219,6 +8220,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing identities
    */
   openManageIdentities() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManageIdentities'));
   }
 
@@ -8226,6 +8228,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing credit cards
    */
   openManageCreditCards() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManageCreditCards'));
   }
 
@@ -9775,19 +9778,22 @@ class WindowsOverlayDeviceInterface extends _InterfacePrototype.default {
    * @returns {Promise<any>}
    */
   openManagePasswords() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManagePasswordsCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManagePasswordsCall({}));
+    return this._closeAutofillParent();
   }
   /**
    * @returns {Promise<any>}
    */
   openManageCreditCards() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManageCreditCardsCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManageCreditCardsCall({}));
+    return this._closeAutofillParent();
   }
   /**
    * @returns {Promise<any>}
    */
   openManageIdentities() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManageIdentitiesCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManageIdentitiesCall({}));
+    return this._closeAutofillParent();
   }
 
   /**
@@ -16587,7 +16593,6 @@ class HTMLTooltipUIController extends _UIController.UIController {
    * @private
    */
   _onManage(type) {
-    this.removeTooltip();
     switch (type) {
       case 'credentials':
         return this._options.device.openManagePasswords();
diff --git a/swift-package/Resources/assets/autofill.js b/swift-package/Resources/assets/autofill.js
index fd485bd79..533aa3862 100644
--- a/swift-package/Resources/assets/autofill.js
+++ b/swift-package/Resources/assets/autofill.js
@@ -3849,6 +3849,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing passwords
    */
   openManagePasswords() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManagePasswords'));
   }
 
@@ -3856,6 +3857,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing identities
    */
   openManageIdentities() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManageIdentities'));
   }
 
@@ -3863,6 +3865,7 @@ class AppleDeviceInterface extends _InterfacePrototype.default {
    * Opens the native UI for managing credit cards
    */
   openManageCreditCards() {
+    this._closeAutofillParent();
     return this.deviceApi.notify((0, _index.createNotification)('pmHandlerOpenManageCreditCards'));
   }
 
@@ -5412,19 +5415,22 @@ class WindowsOverlayDeviceInterface extends _InterfacePrototype.default {
    * @returns {Promise<any>}
    */
   openManagePasswords() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManagePasswordsCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManagePasswordsCall({}));
+    return this._closeAutofillParent();
   }
   /**
    * @returns {Promise<any>}
    */
   openManageCreditCards() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManageCreditCardsCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManageCreditCardsCall({}));
+    return this._closeAutofillParent();
   }
   /**
    * @returns {Promise<any>}
    */
   openManageIdentities() {
-    return this.deviceApi.notify(new _deviceApiCalls.OpenManageIdentitiesCall({}));
+    this.deviceApi.notify(new _deviceApiCalls.OpenManageIdentitiesCall({}));
+    return this._closeAutofillParent();
   }
 
   /**
@@ -12224,7 +12230,6 @@ class HTMLTooltipUIController extends _UIController.UIController {
    * @private
    */
   _onManage(type) {
-    this.removeTooltip();
     switch (type) {
       case 'credentials':
         return this._options.device.openManagePasswords();