diff --git a/astrid/res/layout-large-land/filter_list_wrapper_activity.xml b/astrid/res/layout-large-land/filter_list_wrapper_activity.xml
index 607e24c12..ed22c143e 100644
--- a/astrid/res/layout-large-land/filter_list_wrapper_activity.xml
+++ b/astrid/res/layout-large-land/filter_list_wrapper_activity.xml
@@ -4,26 +4,34 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal">
-    <fragment
-	    xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:name="com.todoroo.astrid.activity.FilterListActivity"
+    <FrameLayout
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
-	    android:id="@+id/filterlist_fragment"
-	    android:layout_weight="67">
-        <!-- Preview: layout=@layout/filter_list_activity -->
-	</fragment>
+	    android:id="@+id/filterlist_fragment_container"
+        android:layout_weight="67">
+	    <fragment
+		    android:name="com.todoroo.astrid.activity.FilterListActivity"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:tag="filterlist_fragment">
+	        <!-- Preview: layout=@layout/filter_list_activity -->
+		</fragment>
+	</FrameLayout>
 	<View 
 	    android:layout_width="1px"
 	    android:layout_height="match_parent"
 	    android:background="#000000"/>
-    <fragment
-	    xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:name="com.todoroo.astrid.activity.TaskListActivity"
+	<FrameLayout
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
-	    android:id="@+id/tasklist_fragment"
-	    android:layout_weight="33">
-        <!-- Preview: layout=@layout/task_list_activity -->
-	</fragment>
+	    android:id="@+id/tasklist_fragment_container"
+        android:layout_weight="33">
+	    <fragment
+		    android:name="com.todoroo.astrid.activity.TaskListActivity"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:tag="tasklist_fragment">
+	        <!-- Preview: layout=@layout/task_list_activity -->
+		</fragment>
+	</FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout-large-land/task_edit_wrapper_activity.xml b/astrid/res/layout-large-land/task_edit_wrapper_activity.xml
index c061b046b..0ea6924be 100644
--- a/astrid/res/layout-large-land/task_edit_wrapper_activity.xml
+++ b/astrid/res/layout-large-land/task_edit_wrapper_activity.xml
@@ -4,26 +4,34 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal">
-    <fragment
-	    xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:name="com.todoroo.astrid.activity.TaskListActivity"
+    <FrameLayout
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
-	    android:id="@+id/tasklist_fragment"
-	    android:layout_weight="67">
-        <!-- Preview: layout=@layout/task_list_activity -->
-	</fragment>
+	    android:layout_weight="67"
+        android:id="@+id/tasklist_fragment_container">
+	    <fragment
+		    android:name="com.todoroo.astrid.activity.TaskListActivity"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:tag="tasklist_fragment">
+	        <!-- Preview: layout=@layout/task_list_activity -->
+		</fragment>
+	</FrameLayout>
 	<View 
         android:layout_width="1px"
         android:layout_height="match_parent"
         android:background="#000000"/>
-	<fragment
-	    xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:name="com.todoroo.astrid.activity.TaskEditActivity"
+	<FrameLayout
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
-	    android:id="@+id/taskedit_fragment"
-	    android:layout_weight="33">
-        <!-- Preview: layout=@layout/task_edit_activity -->
-	</fragment>
+        android:layout_weight="33"	    
+        android:id="@+id/taskedit_fragment_container">
+		<fragment
+		    android:name="com.todoroo.astrid.activity.TaskEditActivity"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:tag="taskedit_fragment">
+	        <!-- Preview: layout=@layout/task_edit_activity -->
+		</fragment>
+	</FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout-large-land/task_list_wrapper_activity.xml b/astrid/res/layout-large-land/task_list_wrapper_activity.xml
index adbc67df0..0c0ec9a08 100644
--- a/astrid/res/layout-large-land/task_list_wrapper_activity.xml
+++ b/astrid/res/layout-large-land/task_list_wrapper_activity.xml
@@ -4,26 +4,34 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal">
-    <fragment
-	    xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:name="com.todoroo.astrid.activity.FilterListActivity"
+    <FrameLayout
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
-	    android:id="@+id/filterlist_fragment"
-	    android:layout_weight="67">
-        <!-- Preview: layout=@layout/filter_list_activity -->
-	</fragment>
+	    android:layout_weight="67"
+	    android:id="@+id/filterlist_fragment_container">
+	    <fragment
+		    android:name="com.todoroo.astrid.activity.FilterListActivity"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:id="@+id/filterlist_fragment">
+	        <!-- Preview: layout=@layout/filter_list_activity -->
+		</fragment>
+	</FrameLayout>
 	<View 
         android:layout_width="1px"
         android:layout_height="match_parent"
         android:background="#000000"/>
-    <fragment
-	    xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:name="com.todoroo.astrid.activity.TaskListActivity"
+	<FrameLayout
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
-	    android:id="@+id/tasklist_fragment"
-	    android:layout_weight="33">
-        <!-- Preview: layout=@layout/task_list_activity -->
-	</fragment>
+        android:layout_weight="33"
+        android:id="@+id/tasklist_fragment_container">
+	    <fragment
+		    android:name="com.todoroo.astrid.activity.TaskListActivity"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:tag="tasklist_fragment">
+	        <!-- Preview: layout=@layout/task_list_activity -->
+		</fragment>
+	</FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/filter_list_wrapper_activity.xml b/astrid/res/layout/filter_list_wrapper_activity.xml
index 7cee3fcd5..aa2a9b173 100644
--- a/astrid/res/layout/filter_list_wrapper_activity.xml
+++ b/astrid/res/layout/filter_list_wrapper_activity.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="com.todoroo.astrid.activity.FilterListActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/filterlist_fragment">
-</fragment>
\ No newline at end of file
+	<fragment
+	    android:name="com.todoroo.astrid.activity.FilterListActivity"
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:tag="filterlist_fragment">
+	</fragment>
+</FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_edit_wrapper_activity.xml b/astrid/res/layout/task_edit_wrapper_activity.xml
index 4a7586aa2..d633719e4 100644
--- a/astrid/res/layout/task_edit_wrapper_activity.xml
+++ b/astrid/res/layout/task_edit_wrapper_activity.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="com.todoroo.astrid.activity.TaskEditActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/taskedit_fragment">
-</fragment>
\ No newline at end of file
+    android:id="@+id/taskedit_fragment_container">
+	<fragment
+	    android:name="com.todoroo.astrid.activity.TaskEditActivity"
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:tag="taskedit_fragment">
+	</fragment>
+</FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_list_wrapper_activity.xml b/astrid/res/layout/task_list_wrapper_activity.xml
index 6a904c32c..aa4d013a1 100644
--- a/astrid/res/layout/task_list_wrapper_activity.xml
+++ b/astrid/res/layout/task_list_wrapper_activity.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="com.todoroo.astrid.activity.TaskListActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/tasklist_fragment">
-</fragment>
\ No newline at end of file
+    android:id="@+id/tasklist_fragment_container">
+	<fragment
+	    android:name="com.todoroo.astrid.activity.TaskListActivity"
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:tag="tasklist_fragment">
+	</fragment>
+</FrameLayout>
\ No newline at end of file
diff --git a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
index e146428b3..59909e277 100644
--- a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
@@ -48,7 +48,7 @@ public class AstridWrapperActivity extends FragmentActivity
 
     protected TaskListActivity getTaskListFragment() {
         TaskListActivity frag = (TaskListActivity) getSupportFragmentManager()
-                .findFragmentById(R.id.tasklist_fragment);
+                .findFragmentByTag(TaskListActivity.TAG_TASKLIST_FRAGMENT);
         if (frag == null || !frag.isInLayout())
             return null;
 
@@ -109,7 +109,7 @@ public class AstridWrapperActivity extends FragmentActivity
         } else {
             // If showing both fragments, directly update the tasklist-fragment
             TaskListActivity tasklist = (TaskListActivity) getSupportFragmentManager()
-                    .findFragmentById(R.id.tasklist_fragment);
+                    .findFragmentByTag(TaskListActivity.TAG_TASKLIST_FRAGMENT);
 
             if(item instanceof Filter) {
                 Filter filter = (Filter)item;
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index 37a473883..c88569e36 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -95,6 +95,8 @@ import com.todoroo.astrid.utility.Constants;
  */
 public class FilterListActivity extends ExpandableListFragment {
 
+    public static final String TAG_FILTERLIST_FRAGMENT = "filterlist_fragment";
+
     // -- extra codes
     //public static final String SHOW_BACK_BUTTON = "show_back"; //$NON-NLS-1$
 
@@ -207,7 +209,7 @@ public class FilterListActivity extends ExpandableListFragment {
 
         onNewIntent(getActivity().getIntent());
 
-        Fragment tasklistFrame = getFragmentManager().findFragmentById(R.id.tasklist_fragment);
+        Fragment tasklistFrame = getFragmentManager().findFragmentByTag(TaskListActivity.TAG_TASKLIST_FRAGMENT);
         mDualFragments = (tasklistFrame != null) && tasklistFrame.isInLayout();
 
         if (mDualFragments) {
@@ -473,7 +475,7 @@ public class FilterListActivity extends ExpandableListFragment {
                 return true;
             }
             default: {
-                Fragment tasklist = getSupportFragmentManager().findFragmentById(R.id.tasklist_fragment);
+                Fragment tasklist = getSupportFragmentManager().findFragmentByTag(TaskListActivity.TAG_TASKLIST_FRAGMENT);
                 if (tasklist != null && tasklist.isInLayout())
                     return tasklist.onOptionsItemSelected(item);
             }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 4cf9a7053..885b3622d 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -107,6 +107,8 @@ import com.todoroo.astrid.voice.VoiceInputAssistant;
  */
 public final class TaskEditActivity extends Fragment {
 
+    public static final String TAG_TASKEDIT_FRAGMENT = "taskedit_fragment";
+
     // --- bundle tokens
 
     /**
@@ -290,7 +292,7 @@ public final class TaskEditActivity extends Fragment {
         setHasOptionsMenu(true);
         getSupportActivity().getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        Fragment tasklistFrame = getFragmentManager().findFragmentById(R.id.tasklist_fragment);
+        Fragment tasklistFrame = getFragmentManager().findFragmentByTag(TaskListActivity.TAG_TASKLIST_FRAGMENT);
         mDualFragments = (tasklistFrame != null) && tasklistFrame.isInLayout();
 
         setUpUIComponents();
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java
index 095d9b172..1ea79ebcf 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java
@@ -28,7 +28,7 @@ public class TaskEditWrapperActivity extends AstridWrapperActivity {
         super.onResume();
 
         Fragment frag = (Fragment) getSupportFragmentManager()
-                .findFragmentById(R.id.tasklist_fragment);
+                .findFragmentByTag(TaskListActivity.TAG_TASKLIST_FRAGMENT);
         if (frag != null) {
             mMultipleFragments = true;
         } else {
@@ -39,7 +39,7 @@ public class TaskEditWrapperActivity extends AstridWrapperActivity {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         TaskEditActivity frag = (TaskEditActivity) getSupportFragmentManager()
-                .findFragmentById(R.id.taskedit_fragment);
+                .findFragmentByTag(TaskEditActivity.TAG_TASKEDIT_FRAGMENT);
         if (frag != null && frag.isInLayout())
             return frag.onKeyDown(keyCode, event);
         return super.onKeyDown(keyCode, event);
@@ -48,7 +48,7 @@ public class TaskEditWrapperActivity extends AstridWrapperActivity {
     @Override
     public void setTitle(CharSequence title) {
         Fragment frag = (Fragment) getSupportFragmentManager()
-                .findFragmentById(R.id.tasklist_fragment);
+                .findFragmentByTag(TaskListActivity.TAG_TASKLIST_FRAGMENT);
         if (frag != null && frag.isInLayout())
             ((TextView)frag.getView().findViewById(R.id.listLabel)).setText(title);
         // update the actionbar-title
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 3152c16eb..77cba4a41 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -128,6 +128,8 @@ import com.todoroo.astrid.widget.TasksWidget;
 public class TaskListActivity extends ListFragment implements OnScrollListener,
         GestureInterface, OnSortSelectedListener {
 
+    public static final String TAG_TASKLIST_FRAGMENT = "tasklist_fragment";
+
     // --- activities
 
     private static final long BACKGROUND_REFRESH_INTERVAL = 120000L;