diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index b82721cce..19fbed471 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -738,6 +738,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             }
             model = TaskService.createWithValues(values, null,
                     taskService, metadataService);
+            getActivity().getIntent().putExtra(TOKEN_ID, model.getId());
         }
 
         if (model.getValue(Task.TITLE).length() == 0) {
@@ -960,12 +961,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                 Toast.LENGTH_SHORT).show();
     }
 
-    protected void commentsButtonClick() {
-        Intent launchIntent = new Intent(getActivity(), EditNoteActivity.class);
-        launchIntent.putExtra(EditNoteActivity.EXTRA_TASK_ID, model.getId());
-        startActivity(launchIntent);
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {