diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
index 636edf7aa..01241687d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
@@ -80,9 +80,20 @@ public class UploadServiceChooserActivity extends Activity {
     Intent intent = getIntent();
     trackId = intent.getLongExtra(TRACK_ID, -1L);
     sendType = intent.getParcelableExtra(SEND_TYPE);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
     showDialog(SERVICE_PICKER_DIALOG);
   }
 
+  @Override
+  protected void onPause() {
+    super.onPause();
+    removeDialog(SERVICE_PICKER_DIALOG);
+  }
+
   @Override
   protected Dialog onCreateDialog(int id) {
     switch (id) {