diff --git a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
index fbfa6da8f..8a30a79a4 100644
--- a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
@@ -140,6 +140,7 @@ public class AstridWrapperActivity extends FragmentActivity
     public void onTaskListItemClicked(long taskId) {
         Intent intent = new Intent(this, TaskEditWrapperActivity.class);
         intent.putExtra(TaskEditActivity.TOKEN_ID, taskId);
+        getIntent().putExtra(TaskEditActivity.TOKEN_ID, taskId); // Needs to be in activity intent so that TEA onResume doesn't create a blank activity
         if (getIntent().hasExtra(TaskListActivity.TOKEN_FILTER))
             intent.putExtra(TaskListActivity.TOKEN_FILTER, getIntent().getParcelableExtra(TaskListActivity.TOKEN_FILTER));