diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java
index 669966cff..62fde9e7a 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java
@@ -207,10 +207,6 @@ public class AstridActivity extends InjectingActionBarActivity
 
     @Override
     public void onTaskListItemClicked(long taskId) {
-        editTask(taskId);
-    }
-
-    private void editTask(long taskId) {
         Intent intent = new Intent(this, TaskEditActivity.class);
         intent.putExtra(TaskEditFragment.TOKEN_ID, taskId);
         getIntent().putExtra(TaskEditFragment.TOKEN_ID, taskId); // Needs to be in activity intent so that TEA onResume doesn't create a blank activity
diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 91395541e..e06aebf9c 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -293,21 +293,23 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
             getListView().setItemsCanFocus(false);
         }
 
-        getListView().setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view,
-                    int position, long id) {
-                if (taskAdapter != null) {
-                    TodorooCursor<Task> cursor = (TodorooCursor<Task>)taskAdapter.getItem(position);
-                    Task task = new Task(cursor);
-                    if(task.isDeleted()) {
-                        return;
-                    }
+        if (!(this instanceof SubtasksListFragment)) {
+            getListView().setOnItemClickListener(new OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> parent, View view,
+                                        int position, long id) {
+                    if (taskAdapter != null) {
+                        TodorooCursor<Task> cursor = (TodorooCursor<Task>) taskAdapter.getItem(position);
+                        Task task = new Task(cursor);
+                        if (task.isDeleted()) {
+                            return;
+                        }
 
-                    onTaskListItemClicked(id);
+                        onTaskListItemClicked(id);
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     /**
diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java
index e52d3734d..07855710d 100644
--- a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -533,7 +533,16 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         viewHolder.details2.setText(actual);
     }
 
-    protected TaskRowListener listener = new TaskRowListener();
+    public void onClick(View v) {
+        // expand view (unless deleted)
+        final ViewHolder viewHolder = (ViewHolder)v.getTag();
+        if(viewHolder.task.isDeleted()) {
+            return;
+        }
+
+        long taskId = viewHolder.task.getId();
+        fragment.onTaskListItemClicked(taskId);
+    }
 
     private Pair<Float, Float> lastTouchYRawY = new Pair<>(0f, 0f);
 
@@ -541,7 +550,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      * Set listeners for this view. This is called once per view when it is
      * created.
      */
-    protected void addListeners(final View container) {
+    private void addListeners(final View container) {
         final ViewHolder viewHolder = (ViewHolder)container.getTag();
 
         // check box listener
@@ -870,24 +879,10 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         }
     };
 
-    protected ViewHolder getTagFromCheckBox(View v) {
+    private ViewHolder getTagFromCheckBox(View v) {
         return (ViewHolder)((View)v.getParent()).getTag();
     }
 
-    public class TaskRowListener implements OnClickListener {
-        @Override
-        public void onClick(View v) {
-            // expand view (unless deleted)
-            final ViewHolder viewHolder = (ViewHolder)v.getTag();
-            if(viewHolder.task.isDeleted()) {
-                return;
-            }
-
-            long taskId = viewHolder.task.getId();
-            fragment.onTaskListItemClicked(taskId);
-        }
-    }
-
     /** Helper method to adjust a tasks' appearance if the task is completed or
      * uncompleted.
      */
diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
index 49fee18f6..d8d2dcb87 100644
--- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
+++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
@@ -163,7 +163,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
             if(v == null) {
                 return;
             }
-            taskAdapter.getListener().onClick(v);
+            taskAdapter.onClick(v);
         }
     };
 
@@ -193,11 +193,6 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
             super(preferences, taskAttachmentDao, taskService, activity, resource, c, query, null);
         }
 
-        @Override
-        protected ViewHolder getTagFromCheckBox(View v) {
-            return (ViewHolder)((View)v.getParent()).getTag();
-        }
-
         @Override
         public synchronized void setFieldContentsAndVisibility(View view) {
             super.setFieldContentsAndVisibility(view);
@@ -206,15 +201,6 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
             int indent = updater.getIndentForTask(vh.task.getUuid());
             vh.rowBody.setPadding(Math.round(indent * 20 * metrics.density), 0, 0, 0);
         }
-
-        @Override
-        protected void addListeners(View container) {
-            super.addListeners(container);
-        }
-
-        public TaskRowListener getListener() {
-            return listener;
-        }
     }
 
     private final Map<String, ArrayList<String>> chainedCompletions =
diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
index b2a433582..a2dd12fbf 100644
--- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
+++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
@@ -178,7 +178,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
             if(v == null) {
                 return;
             }
-            taskAdapter.getListener().onClick(v);
+            taskAdapter.onClick(v);
         }
     };
 
@@ -206,11 +206,6 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
             super(preferences, taskAttachmentDao, taskService, activity, resource, c, query, null);
         }
 
-        @Override
-        protected ViewHolder getTagFromCheckBox(View v) {
-            return (ViewHolder)((View)v.getParent()).getTag();
-        }
-
         @Override
         public synchronized void setFieldContentsAndVisibility(View view) {
             super.setFieldContentsAndVisibility(view);
@@ -219,15 +214,6 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
             int indent = vh.task.getValue(updater.indentProperty());
             vh.rowBody.setPadding(Math.round(indent * 20 * metrics.density), 0, 0, 0);
         }
-
-        @Override
-        protected void addListeners(View container) {
-            super.addListeners(container);
-        }
-
-        public TaskRowListener getListener() {
-            return listener;
-        }
     }
 
     private final Map<Long, ArrayList<Long>> chainedCompletions =