diff --git a/astrid/res/layout/task_adapter_draggable_row.xml b/astrid/res/layout/task_adapter_draggable_row.xml
index fbac5f86b..7aa196d07 100644
--- a/astrid/res/layout/task_adapter_draggable_row.xml
+++ b/astrid/res/layout/task_adapter_draggable_row.xml
@@ -35,7 +35,7 @@
             android:scaleType="center"
             android:src="@drawable/grabber"/>
             
-        <LinearLayout
+        <LinearLayout android:id="@+id/taskText"
             android:layout_width="fill_parent"
             android:layout_height="42dip"
             android:layout_weight="100"
diff --git a/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java
index a37ffa2a2..86c92825d 100644
--- a/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/DraggableTaskListActivity.java
@@ -14,8 +14,8 @@ import android.widget.TextView;
 import com.commonsware.cwac.tlv.TouchListView;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.Property;
-import com.todoroo.andlib.data.Property.IntegerProperty;
 import com.todoroo.andlib.data.TodorooCursor;
+import com.todoroo.andlib.data.Property.IntegerProperty;
 import com.todoroo.astrid.adapter.TaskAdapter;
 import com.todoroo.astrid.data.Task;
 
@@ -115,10 +115,12 @@ public class DraggableTaskListActivity extends TaskListActivity {
             viewHolder.completeBox.setOnClickListener(completeBoxListener);
 
             // context menu listener
-            viewHolder.nameView.setOnCreateContextMenuListener(listener);
+            View taskText = container.findViewById(R.id.taskText);
+            taskText.setTag(viewHolder);
+            taskText.setOnCreateContextMenuListener(listener);
 
             // tap listener
-            viewHolder.nameView.setOnClickListener(listener);
+            taskText.setOnClickListener(listener);
         }
     }