diff --git a/astrid/res/layout/task_list_wrapper_activity_3pane.xml b/astrid/res/layout/task_list_wrapper_activity_3pane.xml
index e548287ad..294a3050f 100644
--- a/astrid/res/layout/task_list_wrapper_activity_3pane.xml
+++ b/astrid/res/layout/task_list_wrapper_activity_3pane.xml
@@ -30,27 +30,19 @@
 	    android:layout_height="match_parent"
 	    android:layout_weight="40"
 	    android:orientation="vertical">
-	  <!-- Task Edit -->
-	    <FrameLayout
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-	        android:layout_weight="50"
-	        android:id="@+id/taskedit_fragment_container"
-	        android:visibility="gone" />
-		
-	    <View
-	        android:id="@+id/edit_separator"
-	        android:layout_height="1px"
-	        android:layout_width="match_parent"
-	        android:background="?attr/asSeparatorBackground"
-	        android:visibility="gone"/>
+        <!-- Task List -->
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="50"
+            android:id="@+id/tasklist_fragment_container" />	    
 	    
-	    <!-- Task List -->
+        <!-- Task Edit -->
 		<FrameLayout
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-	        android:layout_weight="50"
-	        android:id="@+id/tasklist_fragment_container" />
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/taskedit_fragment_container"
+            android:visibility="gone" />
 	  
     </LinearLayout>
   
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 411468354..923272e6d 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -118,9 +118,9 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         public void onClick(View v) {
             if (fragmentLayout == LAYOUT_DOUBLE) {
                 View container = findViewById(R.id.taskedit_fragment_container);
-                View separator = findViewById(R.id.edit_separator);
+                if (getTaskEditFragment() != null)
+                    return;
                 container.setVisibility(container.getVisibility() == View.VISIBLE ? View.GONE : View.VISIBLE);
-                separator.setVisibility(container.getVisibility());
                 commentsVisible = container.getVisibility() == View.VISIBLE;
             } else {
                 // In this case we should be in LAYOUT_SINGLE--delegate to the task list fragment