diff --git a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
index c03030f70..338e30a28 100644
--- a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
@@ -171,7 +171,8 @@ public class AstridWrapperActivity extends FragmentActivity
     @Override
     public void onBackPressed() {
         // manage task edit visibility
-        if(findViewById(R.id.taskedit_fragment_container).getVisibility() == View.VISIBLE) {
+        View taskeditFragmentContainer = findViewById(R.id.taskedit_fragment_container);
+        if(taskeditFragmentContainer != null && taskeditFragmentContainer.getVisibility() == View.VISIBLE) {
             if(fragmentLayout == LAYOUT_DOUBLE) {
                 findViewById(R.id.taskedit_fragment_container).setVisibility(View.GONE);
                 findViewById(R.id.filterlist_fragment_container).setVisibility(View.VISIBLE);
@@ -215,7 +216,10 @@ public class AstridWrapperActivity extends FragmentActivity
             }
 
             FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            ft.replace(container, fragment, tag);
+            if (container == 0)
+                ft.add(fragment, tag);
+            else
+                ft.replace(container, fragment, tag);
             ft.commit();
         }
         return fragment;
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
index c34577e4b..829d6268e 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
@@ -79,6 +79,7 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
 		    actionBar.setDisplayHomeAsUpEnabled(true);
 		    listsNav.setOnClickListener(popupMenuClickListener);
 		    createPopover();
+		    setupPopoverWithFilterList((FilterListActivity) setupFragment(FilterListActivity.TAG_FILTERLIST_FRAGMENT, 0, FilterListActivity.class));
 		}
     }