diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
index 4ffc137b0..38550a2ac 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
@@ -96,7 +96,6 @@ public class BackupActivityHelper {
           showToast(R.string.io_write_finished);
         } catch (IOException e) {
           showToast(R.string.io_write_failed);
-          return;
         } finally {
           dismissDialog(progressDialog);
         }
@@ -131,7 +130,7 @@ public class BackupActivityHelper {
     // Show a confirmation dialog
     Builder confirmationDialogBuilder = new AlertDialog.Builder(activity);
     confirmationDialogBuilder.setMessage(R.string.restore_overwrites_warning);
-    confirmationDialogBuilder.setCancelable(false);
+    confirmationDialogBuilder.setCancelable(true);
     confirmationDialogBuilder.setPositiveButton(android.R.string.yes,
         new OnClickListener() {
           @Override
@@ -139,6 +138,7 @@ public class BackupActivityHelper {
             pickBackupForRestore(backupDates);
           }
         });
+    confirmationDialogBuilder.setNegativeButton(android.R.string.no, null);
     confirmationDialogBuilder.create().show();
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
index e5baca620..209ac12b3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
@@ -49,7 +49,7 @@ import java.util.TimeZone;
 class ExternalFileBackup {
   // Filename format - in UTC
   private static final SimpleDateFormat BACKUP_FILENAME_FORMAT =
-      new SimpleDateFormat("'backup-'yyyy-MM-dd_HH-mm-ss");
+      new SimpleDateFormat("'backup-'yyyy-MM-dd_HH-mm-ss'.mytracks'");
   static {
     BACKUP_FILENAME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
   }