diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index 398e4b096c6..3186a560a72 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -815,14 +815,6 @@ public class ChooseLockGeneric extends SettingsActivity {
             return intent;
         }
 
-        @Override
-        public void onStop() {
-            super.onStop();
-            if (!getActivity().isChangingConfigurations() && !mWaitingForConfirmation) {
-                getActivity().finish();
-            }
-        }
-
         @Override
         public void onDestroy() {
             super.onDestroy();