diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index 5c3472e88..f320b311a 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -105,6 +105,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
 
     /** For indicating the new list screen should be launched at fragment setup time */
     public static final String TOKEN_CREATE_NEW_LIST_NAME = "newListName"; //$NON-NLS-1$
+    private static final String FRAG_TAG_TASK_LIST = "frag_tag_task_list";
 
     public static final String OPEN_FILTER = "open_filter"; //$NON-NLS-1$
     public static final String LOAD_FILTER = "load_filter";
@@ -195,8 +196,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
         FragmentManager fragmentManager = getSupportFragmentManager();
         fragmentManager.popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
         fragmentManager.beginTransaction()
-                .replace(isDoublePaneLayout() ? R.id.master_dual : R.id.single_pane, taskListFragment, TaskListFragment.TAG_TASKLIST_FRAGMENT)
-                .addToBackStack(TaskListFragment.TAG_TASKLIST_FRAGMENT)
+                .replace(isDoublePaneLayout() ? R.id.master_dual : R.id.single_pane, taskListFragment, FRAG_TAG_TASK_LIST)
                 .commit();
     }
 
@@ -378,8 +378,8 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
             } else {
                 taskEditFragment.discardButtonClick();
             }
-        } else if (!isFinishing()) {
-            finish();
+        } else {
+            super.onBackPressed();
         }
     }
 
@@ -417,7 +417,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
 
     public TaskListFragment getTaskListFragment() {
         return (TaskListFragment) getSupportFragmentManager()
-                .findFragmentByTag(TaskListFragment.TAG_TASKLIST_FRAGMENT);
+                .findFragmentByTag(FRAG_TAG_TASK_LIST);
     }
 
     public TaskEditFragment getTaskEditFragment() {
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index b1fa45f16..97317039c 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -115,8 +115,6 @@ public class TaskListFragment extends InjectingListFragment implements
     private static final String EXTRA_FILTER = "extra_filter";
     private static final String FRAG_TAG_SORT_DIALOG = "frag_tag_sort_dialog";
 
-    public static final String TAG_TASKLIST_FRAGMENT = "tasklist_fragment"; //$NON-NLS-1$
-
     public static final int VOICE_RECOGNITION_REQUEST_CODE = 1234;
     private static final int REQUEST_EDIT_FILTER = 11544;