diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 9680d5a2748..c455a0a9301 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -348,9 +348,9 @@ public class ChooseLockPattern extends SettingsActivity {
          */
         enum RightButtonMode {
             Continue(R.string.next_label, true),
-            ContinueDisabled(R.string.next_label, false),
+            ContinueDisabled(R.string.next_label, true),
             Confirm(R.string.lockpattern_confirm_button_text, true),
-            ConfirmDisabled(R.string.lockpattern_confirm_button_text, false),
+            ConfirmDisabled(R.string.lockpattern_confirm_button_text, true),
             Ok(android.R.string.ok, true);
 
             /**
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
index be3b63bf805..1d42495d077 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
@@ -287,7 +287,6 @@ public class SetupChooseLockPatternTest {
         final FooterButton nextButton = footerBarMixin.getPrimaryButton();
 
         assertThat(nextButton.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(nextButton.isEnabled()).isFalse();
 
         enterPattern();
 
@@ -333,7 +332,6 @@ public class SetupChooseLockPatternTest {
                 mContext.getString(R.string.lockpattern_need_to_unlock_wrong));
         assertThat(nextButton.getText().toString()).isEqualTo(
                 mContext.getString(R.string.lockpattern_confirm_button_text));
-        assertThat(nextButton.isEnabled()).isFalse();
     }
 
     @Test