diff --git a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
index 6637582a7..39b48986a 100644
--- a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
@@ -171,6 +171,10 @@ public class AstridActivity extends FragmentActivity
 
                 setIntent(intent);
 
+                if (fragmentLayout == LAYOUT_TRIPLE && getTaskEditFragment() != null) {
+                    onBackPressed(); // remove the task edit fragment when switching between lists
+                }
+
                 setupTasklistFragmentWithFilter(filter);
 
                 // no animation for dualpane-layout