diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index c353181ba..280851c76 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -87,6 +87,7 @@ public class TrackListActivity extends FragmentActivity {
       try {
         recordingTrackId = service.startNewTrack();
         startNewRecording = false;
+        startTrackDetailActivity(recordingTrackId);
         Toast.makeText(
             TrackListActivity.this, R.string.track_list_record_success, Toast.LENGTH_SHORT).show();
         Log.d(TAG, "Started a new recording");
@@ -157,10 +158,7 @@ public class TrackListActivity extends FragmentActivity {
     listView.setOnItemClickListener(new OnItemClickListener() {
       @Override
       public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        Intent intent = new Intent(TrackListActivity.this, TrackDetailActivity.class)
-            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK)
-            .putExtra(TrackDetailActivity.EXTRA_TRACK_ID, id);
-        startActivity(intent);
+        startTrackDetailActivity(id);
       }
     });
     adapter = new ResourceCursorAdapter(this, R.layout.track_list_item, null, 0) {
@@ -356,6 +354,18 @@ public class TrackListActivity extends FragmentActivity {
     }
   }
 
+  /**
+   * Starts {@link TrackDetailActivity}.
+   * 
+   * @param trackId the track id.
+   */
+  private void startTrackDetailActivity(long trackId) {
+    Intent intent = new Intent(TrackListActivity.this, TrackDetailActivity.class)
+        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK)
+        .putExtra(TrackDetailActivity.EXTRA_TRACK_ID, trackId);
+    startActivity(intent);
+  }
+
   /**
    * Returns true if recording.
    */