diff --git a/src/views/app.js b/src/views/app.js
index eb6b989c4..d83b65ea3 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -1530,7 +1530,8 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             if ($scope.backupConfig[k] !== SECRET_PLACEHOLDER) tmp[k] = $scope.backupConfig[k];
         });
 
-        download('cloudron_app_backup.json', JSON.stringify(tmp));
+        var filename = 'app-backup-config-' + (new Date).toISOString().replace(/:|T/g,'-').replace(/\..*/,'') + ' (' + $scope.app.fqdn + ')' + '.json';
+        download(filename, JSON.stringify(tmp));
     };
 
     document.getElementById('backupConfigFileInput').onchange = function (event) {
diff --git a/src/views/backups.js b/src/views/backups.js
index e5be1e6a7..07afa56e2 100644
--- a/src/views/backups.js
+++ b/src/views/backups.js
@@ -309,7 +309,8 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
             if ($scope.backupConfig[k] !== SECRET_PLACEHOLDER) tmp[k] = $scope.backupConfig[k];
         });
 
-        download('cloudron_backup.json', JSON.stringify(tmp));
+        var filename = 'cloudron-backup-config-' + (new Date).toISOString().replace(/:|T/g,'-').replace(/\..*/,'') + '.json';
+        download(filename, JSON.stringify(tmp));
     };
 
     $scope.backupDetails = {