diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
index eaf07df73..86cf08f3f 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
@@ -226,7 +226,9 @@ public class MainActivity extends InjectingAppCompatActivity
     } else {
       TaskListFragment existing = getTaskListFragment();
       openTaskListFragment(
-          existing == null || existing.getFilter() != filter ? newTaskListFragment(filter) : existing);
+          existing == null || existing.getFilter() != filter
+              ? newTaskListFragment(getApplicationContext(), filter)
+              : existing);
       openTask(filter);
     }
 
@@ -259,7 +261,7 @@ public class MainActivity extends InjectingAppCompatActivity
   }
 
   private void openTaskListFragment(Filter filter) {
-    openTaskListFragment(newTaskListFragment(filter));
+    openTaskListFragment(newTaskListFragment(getApplicationContext(), filter));
   }
 
   private void openTaskListFragment(@NonNull TaskListFragment taskListFragment) {
diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 59e9873df..b33409c88 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -161,10 +161,12 @@ public final class TaskListFragment extends InjectingFragment
    */
   private TaskListFragmentCallbackHandler callbacks;
 
-  static TaskListFragment newTaskListFragment(Filter filter) {
+  static TaskListFragment newTaskListFragment(Context context, Filter filter) {
     TaskListFragment fragment = new TaskListFragment();
     Bundle bundle = new Bundle();
-    bundle.putParcelable(EXTRA_FILTER, filter);
+    bundle.putParcelable(
+        EXTRA_FILTER,
+        filter == null ? BuiltInFilterExposer.getMyTasksFilter(context.getResources()) : filter);
     fragment.setArguments(bundle);
     return fragment;
   }
@@ -539,15 +541,7 @@ public final class TaskListFragment extends InjectingFragment
   }
 
   public Filter getFilter() {
-    Filter filter = null;
-    Bundle arguments = getArguments();
-    if (arguments != null) {
-      filter = arguments.getParcelable(EXTRA_FILTER);
-    }
-    if (filter == null) {
-      filter = BuiltInFilterExposer.getMyTasksFilter(getResources());
-    }
-    return filter;
+    return getArguments().getParcelable(EXTRA_FILTER);
   }
 
   public void onTaskCreated(List<Task> tasks) {