diff --git a/dist/autofill-debug.js b/dist/autofill-debug.js
index 88ca86014..4ea43dc64 100644
--- a/dist/autofill-debug.js
+++ b/dist/autofill-debug.js
@@ -10510,11 +10510,14 @@ class Form {
         subtype,
         variant
       }, null);
-      if (this.isCredentialsImoprtAvailable) return true;
-
-      // Don't open the tooltip on input focus whenever it'll only show in-context signup
-      if (!hasSavedDetails && isIncontextSignupAvailable) return false;
-      return true;
+      if (hasSavedDetails) {
+        return true;
+      } else if (isIncontextSignupAvailable) {
+        // Don't open the tooltip on input focus whenever it'll only show in-context signup
+        return false;
+      } else {
+        return this.isCredentialsImoprtAvailable;
+      }
     }
     if (this.device.globalConfig.isExtension || this.device.globalConfig.isMobileApp) {
       // Don't open the tooltip on input focus whenever it's showing in-context signup
diff --git a/dist/autofill.js b/dist/autofill.js
index 6568edc5b..2552b407a 100644
--- a/dist/autofill.js
+++ b/dist/autofill.js
@@ -6344,11 +6344,14 @@ class Form {
         subtype,
         variant
       }, null);
-      if (this.isCredentialsImoprtAvailable) return true;
-
-      // Don't open the tooltip on input focus whenever it'll only show in-context signup
-      if (!hasSavedDetails && isIncontextSignupAvailable) return false;
-      return true;
+      if (hasSavedDetails) {
+        return true;
+      } else if (isIncontextSignupAvailable) {
+        // Don't open the tooltip on input focus whenever it'll only show in-context signup
+        return false;
+      } else {
+        return this.isCredentialsImoprtAvailable;
+      }
     }
     if (this.device.globalConfig.isExtension || this.device.globalConfig.isMobileApp) {
       // Don't open the tooltip on input focus whenever it's showing in-context signup
diff --git a/src/Form/Form.js b/src/Form/Form.js
index 1ce05bf75..51982fa4f 100644
--- a/src/Form/Form.js
+++ b/src/Form/Form.js
@@ -771,12 +771,14 @@ class Form {
             // we'd have any other items to show. This lets us know if we're
             // just showing in-context signup, or with other autofill items.
             const hasSavedDetails = this.device.settings.canAutofillType({ mainType, subtype, variant }, null)
-
-            if (this.isCredentialsImoprtAvailable) return true
-
-            // Don't open the tooltip on input focus whenever it'll only show in-context signup
-            if (!hasSavedDetails && isIncontextSignupAvailable) return false
-            return true
+            if (hasSavedDetails) {
+                return true
+            } else if (isIncontextSignupAvailable) {
+                // Don't open the tooltip on input focus whenever it'll only show in-context signup
+                return false
+            } else {
+                return this.isCredentialsImoprtAvailable
+            }
         }
 
         if (this.device.globalConfig.isExtension || this.device.globalConfig.isMobileApp) {
diff --git a/swift-package/Resources/assets/autofill-debug.js b/swift-package/Resources/assets/autofill-debug.js
index 88ca86014..4ea43dc64 100644
--- a/swift-package/Resources/assets/autofill-debug.js
+++ b/swift-package/Resources/assets/autofill-debug.js
@@ -10510,11 +10510,14 @@ class Form {
         subtype,
         variant
       }, null);
-      if (this.isCredentialsImoprtAvailable) return true;
-
-      // Don't open the tooltip on input focus whenever it'll only show in-context signup
-      if (!hasSavedDetails && isIncontextSignupAvailable) return false;
-      return true;
+      if (hasSavedDetails) {
+        return true;
+      } else if (isIncontextSignupAvailable) {
+        // Don't open the tooltip on input focus whenever it'll only show in-context signup
+        return false;
+      } else {
+        return this.isCredentialsImoprtAvailable;
+      }
     }
     if (this.device.globalConfig.isExtension || this.device.globalConfig.isMobileApp) {
       // Don't open the tooltip on input focus whenever it's showing in-context signup
diff --git a/swift-package/Resources/assets/autofill.js b/swift-package/Resources/assets/autofill.js
index 6568edc5b..2552b407a 100644
--- a/swift-package/Resources/assets/autofill.js
+++ b/swift-package/Resources/assets/autofill.js
@@ -6344,11 +6344,14 @@ class Form {
         subtype,
         variant
       }, null);
-      if (this.isCredentialsImoprtAvailable) return true;
-
-      // Don't open the tooltip on input focus whenever it'll only show in-context signup
-      if (!hasSavedDetails && isIncontextSignupAvailable) return false;
-      return true;
+      if (hasSavedDetails) {
+        return true;
+      } else if (isIncontextSignupAvailable) {
+        // Don't open the tooltip on input focus whenever it'll only show in-context signup
+        return false;
+      } else {
+        return this.isCredentialsImoprtAvailable;
+      }
     }
     if (this.device.globalConfig.isExtension || this.device.globalConfig.isMobileApp) {
       // Don't open the tooltip on input focus whenever it's showing in-context signup