diff --git a/src/com/android/settings/biometrics/BiometricUtils.java b/src/com/android/settings/biometrics/BiometricUtils.java
index 1d16dc694d2..342423af982 100644
--- a/src/com/android/settings/biometrics/BiometricUtils.java
+++ b/src/com/android/settings/biometrics/BiometricUtils.java
@@ -42,6 +42,7 @@ import com.android.settings.SetupWizardUtils;
 import com.android.settings.biometrics.face.FaceEnrollIntroduction;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
+import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
 import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction;
 import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;
 import com.android.settings.password.ChooseLockGeneric;
@@ -241,9 +242,13 @@ public class BiometricUtils {
      */
     public static Intent getFingerprintFindSensorIntent(@NonNull Context context,
             @NonNull Intent activityIntent) {
-        Intent intent = new Intent(context, FingerprintEnrollFindSensor.class);
-        SetupWizardUtils.copySetupExtras(activityIntent, intent);
-        return intent;
+        if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {
+            Intent intent = new Intent(context, SetupFingerprintEnrollFindSensor.class);
+            SetupWizardUtils.copySetupExtras(activityIntent, intent);
+            return intent;
+        } else {
+            return new Intent(context, FingerprintEnrollFindSensor.class);
+        }
     }
 
     /**