diff --git a/src/main/java/org/tasks/activities/CalendarSelectionDialog.java b/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
index dd3a6f468..6c99fc5bb 100644
--- a/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
+++ b/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
@@ -63,7 +63,12 @@ public class CalendarSelectionDialog extends InjectingDialogFragment {
                     }
                 });
         if (enableNone) {
-            builder.setNeutralButton(R.string.none, new DialogInterface.OnClickListener() {
+            builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    dialog.dismiss();
+                }
+            }).setNeutralButton(R.string.none, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     handler.selectedCalendar(AndroidCalendar.NONE);