diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java
index 69e60be029e..3a548bc7a98 100644
--- a/src/com/android/settings/SetupChooseLockPattern.java
+++ b/src/com/android/settings/SetupChooseLockPattern.java
@@ -136,6 +136,20 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
             super.updateStage(stage);
             // Only enable the button for retry
             mRetryButton.setEnabled(stage == Stage.FirstChoiceValid);
+
+            switch (stage) {
+                case Introduction:
+                case HelpScreen:
+                case ChoiceTooShort:
+                case FirstChoiceValid:
+                    mRetryButton.setVisibility(View.VISIBLE);
+                    break;
+                case NeedToConfirm:
+                case ConfirmWrong:
+                case ChoiceConfirmed:
+                    mRetryButton.setVisibility(View.INVISIBLE);
+                    break;
+            }
         }
 
         @Override