diff --git a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
index 7638cb8b5..543b0f924 100644
--- a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
+++ b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
@@ -132,6 +132,7 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity imp
             dialogBuilder.newMessageDialog(R.string.discard_changes)
                     .setPositiveButton(R.string.keep_editing, null)
                     .setNegativeButton(R.string.discard, (dialog, which) -> finish())
+                    .setNeutralButton(R.string.save, (dialog, which) -> save())
                     .show();
         }
     }
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index 7f3a39a67..427be4761 100755
--- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -272,6 +272,7 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar
             dialogBuilder.newMessageDialog(R.string.discard_confirmation)
                     .setPositiveButton(R.string.keep_editing, null)
                     .setNegativeButton(R.string.discard, (dialog, which) -> discard())
+                    .setNeutralButton(R.string.save, (dialog, which) -> save())
                     .show();
         } else {
             discard();
diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
index 4ca6cfead..28575ee53 100644
--- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -356,6 +356,7 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity imple
             dialogBuilder.newMessageDialog(R.string.discard_changes)
                     .setPositiveButton(R.string.keep_editing, null)
                     .setNegativeButton(R.string.discard, (dialog, which) -> finish())
+                    .setNeutralButton(R.string.save, (dialog, which) -> saveAndView())
                     .show();
         }
     }