diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index cbe3b9250..cda9d8c68 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -351,6 +351,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             tlfPager.showFilter((Filter) item);
             return true;
         }
+        TaskEditFragment tef = getTaskEditFragment();
+        if (tef != null)
+            onBackPressed();
+
         return super.onFilterItemClicked(item);
     }