diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 6d0d10bf74b..a0a50036738 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -139,6 +139,9 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
         super.onStop();
         mSidecar.setListener(null);
         stopIconAnimation();
+        if (!isChangingConfigurations()) {
+            finish();
+        }
     }
 
     private void animateProgress(int progress) {
@@ -184,6 +187,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
     @Override
     public void onEnrollmentError(CharSequence errString) {
         mErrorText.setText(errString);
+        stopIconAnimation();
     }
 
     @Override