diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 8069c7c370a..b5624eb9b5b 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -537,7 +537,12 @@ public class SecuritySettings extends PreferenceActivity implements
 
         public void onClick(DialogInterface dialog, int which) {
             if (which == DialogInterface.BUTTON_NEGATIVE) {
-                if (mCstorAddCredentialHelper != null) finish();
+                if (mCstorAddCredentialHelper != null) {
+                    // release the object here so that it doesn't get triggerred in
+                    // onDismiss()
+                    mCstorAddCredentialHelper = null;
+                    finish();
+                }
                 return;
             }