diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
index 0fcda846a..004092c2c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
@@ -22,7 +22,6 @@ import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragme
 import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
 import com.google.android.apps.mytracks.util.TrackIconUtils;
-import com.google.android.apps.mytracks.util.TrackNameUtils;
 import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
 import com.google.android.apps.mytracks.util.TrackUtils;
 import com.google.android.maps.mytracks.R;
@@ -162,11 +161,6 @@ public class TrackEditActivity extends AbstractMyTracksActivity
 
     Button cancel = (Button) findViewById(R.id.track_edit_cancel);
     if (getIntent().getBooleanExtra(EXTRA_NEW_TRACK, false)) {
-      String trackName = TrackNameUtils.getTrackName(
-          this, -1L, -1L, myTracksProviderUtils.getFirstValidTrackPoint(trackId));
-      if (trackName != null) {
-        name.setText(trackName);
-      }
       setTitle(R.string.track_edit_new_track_title);
       cancel.setVisibility(View.GONE);
     } else {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
index b1e64650e..42bf9000e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -771,7 +771,14 @@ public class TrackRecordingService extends Service {
         
         // Update the recording track time        
         updateRecordingTrack(track, myTracksProviderUtils.getLastTrackPointId(trackId), false);
-      }      
+      }
+      
+      String trackName = TrackNameUtils.getTrackName(
+          this, -1L, -1L, myTracksProviderUtils.getFirstValidTrackPoint(trackId));
+      if (trackName != null) {
+        track.setName(trackName);
+        myTracksProviderUtils.updateTrack(track);
+      }
 
       if (track.getCategory().equals(PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT)) {
         int activityRecognitionType = PreferencesUtils.getInt(this,