diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
index 89552750c..0fa07c9a9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -498,14 +498,16 @@ public class TagViewFragment extends TaskListFragment {
 
     @Override
     protected void toggleDragDrop(boolean newState) {
+        Filter newFilter = TagFilterExposer.filterFromTagData(getActivity(), tagData);
+
         if(newState)
-            ((FilterWithCustomIntent)filter).customTaskList =
+            ((FilterWithCustomIntent)newFilter).customTaskList =
                 new ComponentName(getActivity(), SubtasksTagListFragment.class);
         else
-            ((FilterWithCustomIntent)filter).customTaskList =
+            ((FilterWithCustomIntent)newFilter).customTaskList =
                 new ComponentName(getActivity(), TagViewFragment.class);
 
-        ((AstridActivity)getActivity()).setupTasklistFragmentWithFilter(filter);
+        ((AstridActivity)getActivity()).setupTasklistFragmentWithFilter(newFilter);
     }
 
     @Override
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 1831d5a63..b85c11211 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -1164,10 +1164,10 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
 
     protected void toggleDragDrop(boolean newState) {
         if(newState)
-            ((AstridActivity)getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(filter,
+            ((AstridActivity)getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(null,
                     SubtasksListFragment.class);
         else
-            ((AstridActivity)getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(filter,
+            ((AstridActivity)getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(null,
                     TaskListFragment.class);
     }