diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index dcd7ca948..b1258d8b9 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -355,15 +355,18 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      * created.
      */
     private void addListeners(final View container) {
+        ViewHolder viewHolder = (ViewHolder)container.getTag();
+
         // check box listener
-        final CheckBox completeBox = ((CheckBox)container.findViewById(R.id.completeBox));
-        completeBox.setOnClickListener(completeBoxListener);
+        viewHolder.completeBox.setOnClickListener(completeBoxListener);
 
         // context menu listener
         container.setOnCreateContextMenuListener(listener);
 
         // tap listener
         container.setOnClickListener(listener);
+        viewHolder.nameView.setTag(viewHolder);
+        viewHolder.nameView.setOnClickListener(listener);
     }
 
     /* ======================================================================