diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index fe0bb63fd07..b00f98ee43b 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -50,7 +50,7 @@ import com.android.settings.R;
 public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
         implements FingerprintEnrollSidecar.Listener {
 
-    private static final String TAG_SIDECAR = "sidecar";
+    static final String TAG_SIDECAR = "sidecar";
 
     private static final int PROGRESS_BAR_MAX = 10000;
     private static final int FINISH_DELAY = 250;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index 63d93354ee8..8122d02b39e 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -23,11 +23,12 @@ import android.os.Bundle;
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
+import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener;
 
 /**
  * Activity explaining the fingerprint sensor location for fingerprint enrollment.
  */
-public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
+public class FingerprintEnrollFindSensor extends FingerprintEnrollBase implements Listener {
 
     private static final int CONFIRM_REQUEST = 1;
     private static final int ENROLLING = 2;
@@ -35,6 +36,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
 
     private FingerprintLocationAnimationView mAnimation;
     private boolean mLaunchedConfirmLock;
+    private FingerprintEnrollSidecar mSidecar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -54,6 +56,14 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
     protected void onStart() {
         super.onStart();
         mAnimation.startAnimation();
+        mSidecar = (FingerprintEnrollSidecar) getFragmentManager().findFragmentByTag(
+                FingerprintEnrollEnrolling.TAG_SIDECAR);
+        if (mSidecar == null) {
+            mSidecar = new FingerprintEnrollSidecar();
+            getFragmentManager().beginTransaction()
+                    .add(mSidecar, FingerprintEnrollEnrolling.TAG_SIDECAR).commit();
+        }
+        mSidecar.setListener(this);
     }
 
     @Override
@@ -125,4 +135,20 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
     protected int getMetricsCategory() {
         return MetricsLogger.FINGERPRINT_FIND_SENSOR;
     }
+
+    @Override
+    public void onEnrollmentHelp(CharSequence helpString) {
+    }
+
+    @Override
+    public void onEnrollmentError(int errMsgId, CharSequence errString) {
+    }
+
+    @Override
+    public void onEnrollmentProgressChange(int steps, int remaining) {
+        // Activity on the sensor should auto-advance to the enrolling step
+        mSidecar.setListener(null);
+        getFragmentManager().beginTransaction().remove(mSidecar).commit();
+        onNextButtonClick();
+    }
 }