diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index 24c450216..b6bc2116e 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -5,7 +5,6 @@
  */
 package com.todoroo.astrid.activity;
 
-import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -30,8 +29,8 @@ import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gtasks.GtasksList;
-import com.todoroo.astrid.gtasks.GtasksSubtaskListFragment;
 import com.todoroo.astrid.gtasks.GtasksListService;
+import com.todoroo.astrid.gtasks.GtasksSubtaskListFragment;
 import com.todoroo.astrid.repeats.RepeatControlSet;
 import com.todoroo.astrid.service.TaskCreator;
 import com.todoroo.astrid.subtasks.SubtasksHelper;
@@ -381,26 +380,6 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
         }
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if ((requestCode == NavigationDrawerFragment.REQUEST_NEW_LIST ||
-                requestCode == TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER) &&
-                resultCode == Activity.RESULT_OK) {
-            if(data == null) {
-                return;
-            }
-
-            Filter newList = data.getParcelableExtra(TagSettingsActivity.TOKEN_NEW_FILTER);
-            if (newList != null) {
-                onFilterItemClicked(newList);
-            }
-
-            repopulateNavigationDrawer();
-        } else {
-            super.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
     public void repopulateNavigationDrawer() {
         navigationDrawer.repopulateList();
     }
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 26f7d0e75..c71048547 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -104,10 +104,6 @@ public class TaskListFragment extends InjectingListFragment implements
     public static final int VOICE_RECOGNITION_REQUEST_CODE = 1234;
     private static final int REQUEST_EDIT_FILTER = 11544;
 
-    // --- activities
-
-    public static final int ACTIVITY_REQUEST_NEW_FILTER = 5;
-
     // --- menu codes
 
     private static final int CONTEXT_MENU_COPY_TASK_ID = R.string.TAd_contextCopyTask;
diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
index ff8460a8a..2b4f025f8 100644
--- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -19,7 +19,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.todoroo.astrid.activity.TaskListActivity;
-import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
@@ -222,7 +221,7 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
                     activity.getResources().getString(R.string.FLA_new_filter),
                     R.drawable.ic_add_24dp,
                     new Intent(activity, CustomFilterActivity.class),
-                    TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER));
+                    NavigationDrawerFragment.ACTIVITY_REQUEST_NEW_FILTER));
         }
 
         addSubMenu(R.string.tags, filterProvider.getTags(), false);
diff --git a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
index e0432d980..1cc9a5668 100644
--- a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
+++ b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
@@ -13,15 +13,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
 
-import org.tasks.activities.TagSettingsActivity;
 import com.todoroo.astrid.activity.TaskListActivity;
-import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.adapter.FilterAdapter;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
 
 import org.tasks.R;
+import org.tasks.activities.TagSettingsActivity;
 import org.tasks.filters.FilterCounter;
 import org.tasks.filters.FilterProvider;
 import org.tasks.filters.NavigationDrawerAction;
@@ -45,6 +44,7 @@ public class NavigationDrawerFragment extends InjectingFragment {
     private static final String TOKEN_LAST_SELECTED = "lastSelected"; //$NON-NLS-1$
 
     public static final int REQUEST_NEW_LIST = 4;
+    public static final int ACTIVITY_REQUEST_NEW_FILTER = 5;
 
     private FilterAdapter adapter = null;
 
@@ -95,17 +95,13 @@ public class NavigationDrawerFragment extends InjectingFragment {
                 TaskListActivity activity = (TaskListActivity) getActivity();
                 activity.restart();
             }
-        } else if ((requestCode == NavigationDrawerFragment.REQUEST_NEW_LIST ||
-                requestCode == TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER) &&
-                resultCode == Activity.RESULT_OK) {
-            if(data == null) {
-                return;
-            }
-
-            Filter newList = data.getParcelableExtra(TagSettingsActivity.TOKEN_NEW_FILTER);
-            if (newList != null) {
-                mCallbacks.onFilterItemClicked(newList);
-                clear();
+        } else if (requestCode == REQUEST_NEW_LIST ||
+                requestCode == ACTIVITY_REQUEST_NEW_FILTER) {
+            if (resultCode == Activity.RESULT_OK && data != null) {
+                Filter newList = data.getParcelableExtra(TagSettingsActivity.TOKEN_NEW_FILTER);
+                if (newList != null) {
+                    mCallbacks.onFilterItemClicked(newList);
+                }
             }
         } else {
             super.onActivityResult(requestCode, resultCode, data);
@@ -235,10 +231,6 @@ public class NavigationDrawerFragment extends InjectingFragment {
         void onFilterItemClicked(FilterListItem item);
     }
 
-    private void clear() {
-        adapter.clear();
-    }
-
     public void repopulateList() {
         adapter.populateList();
     }