diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
index 283d5f47c..b034ba826 100644
--- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
+++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
@@ -212,14 +212,15 @@ public class UserPreference extends AppCompatActivity {
                                     startActivity(intent);
                                 }
                             }).
-                            setNegativeButton(R.string.dialog_cancel,new DialogInterface.OnClickListener() {
+                            setNegativeButton(R.string.dialog_cancel, null).
+                            setOnDismissListener(new DialogInterface.OnDismissListener() {
                                 @Override
-                                public void onClick(DialogInterface dialog, int which) {
+                                public void onDismiss(DialogInterface dialog) {
                                     ((CheckBoxPreference) findPreference("autofill_enable"))
                                             .setChecked(((UserPreference) getActivity()).isServiceEnabled());
                                 }
                             }).show();
-                    return false;
+                    return true;
                 }
             });
         }