diff --git a/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java
index 1e7d62ec1c4ac..a7fc6b66e2c41 100644
--- a/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java
+++ b/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java
@@ -625,7 +625,8 @@ public class LockPatternKeyguardView extends KeyguardViewBase
         final IccCard.State simState = mUpdateMonitor.getSimState();
         if (stuckOnLockScreenBecauseSimMissing() || (simState == IccCard.State.PUK_REQUIRED)) {
             return Mode.LockScreen;
-        } else if (isSecure()) {
+        } else if (isSecure()
+                && mLockPatternUtils.getPasswordMode() == LockPatternUtils.MODE_PATTERN) {
             return Mode.UnlockScreen;
         } else {
             return Mode.LockScreen;