diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 88b344e9906..25bb242b81e 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -120,7 +120,8 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
         
         // Check to see why we were started.
         String progress = SystemProperties.get("vold.encrypt_progress");
-        if ("startup".equals(progress)) {
+
+        if (!"".equals(progress)) {
             setContentView(R.layout.crypt_keeper_progress);
             encryptionProgressInit();
         } else {