diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
index ff53db73c..01a4bd3ea 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -526,6 +526,7 @@ public class TagViewFragment extends TaskListFragment {
 
         ((FilterWithCustomIntent) filter).customTaskList = new ComponentName(getActivity(), customComponent);
 
+        extras.putParcelable(TOKEN_FILTER, filter);
         ((AstridActivity)getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(filter,
                 extras, customComponent);
     }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index c4f5d7110..187cac70c 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -1256,6 +1256,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
     }
 
     protected void toggleDragDrop(boolean newState) {
+        extras.putParcelable(TOKEN_FILTER, filter);
         if(newState)
             ((AstridActivity)getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(filter,
                     extras, SubtasksListFragment.class);