diff --git a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
index 3ad40be7f..7638cb8b5 100644
--- a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
+++ b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
@@ -130,8 +130,8 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity imp
             finish();
         } else {
             dialogBuilder.newMessageDialog(R.string.discard_changes)
-                    .setPositiveButton(R.string.discard, (dialog, which) -> finish())
-                    .setNegativeButton(android.R.string.cancel, null)
+                    .setPositiveButton(R.string.keep_editing, null)
+                    .setNegativeButton(R.string.discard, (dialog, which) -> finish())
                     .show();
         }
     }
diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
index 101420b9e..4ca6cfead 100644
--- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -354,8 +354,8 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity imple
             finish();
         } else {
             dialogBuilder.newMessageDialog(R.string.discard_changes)
-                    .setPositiveButton(R.string.discard, (dialog, which) -> finish())
-                    .setNegativeButton(android.R.string.cancel, null)
+                    .setPositiveButton(R.string.keep_editing, null)
+                    .setNegativeButton(R.string.discard, (dialog, which) -> finish())
                     .show();
         }
     }