diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 641cc7f..1dd24f2 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -444,11 +444,11 @@
         @Override
         public void onResume() {
             super.onResume();
+            updateStage(mUiStage);
+
             if (mSaveAndFinishWorker != null) {
                 setRightButtonEnabled(false);
                 mSaveAndFinishWorker.setListener(this);
-            } else {
-                mLockPatternView.enableInput();
             }
         }