diff --git a/Elwig/Services/DeliveryService.cs b/Elwig/Services/DeliveryService.cs
index 05a8b10..f3c3fb3 100644
--- a/Elwig/Services/DeliveryService.cs
+++ b/Elwig/Services/DeliveryService.cs
@@ -721,9 +721,11 @@ namespace Elwig.Services {
                     FileName = subject == ExportSubject.Selected ? $"Lieferung_{vm.SelectedDelivery?.LsNr}.elwig.zip" : $"Lieferungen_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip",
                     DefaultExt = "elwig.zip",
                     Filter = "Elwig-Export-Datei (*.elwig.zip)|*.elwig.zip",
-                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
+                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig",
+                    AddExtension = false,
                 };
                 if (d.ShowDialog() == true) {
+                    if (!d.FileName.EndsWith(".elwig.zip")) d.FileName += ".elwig.zip";
                     Mouse.OverrideCursor = Cursors.Wait;
                     await Task.Run(async () => {
                         try {
diff --git a/Elwig/Services/MemberService.cs b/Elwig/Services/MemberService.cs
index b7b905c..84634a4 100644
--- a/Elwig/Services/MemberService.cs
+++ b/Elwig/Services/MemberService.cs
@@ -496,11 +496,13 @@ namespace Elwig.Services {
             } else if (mode == ExportMode.Export) {
                 var d = new SaveFileDialog() {
                     FileName = subject == ExportSubject.Selected ? $"Mitglied_{vm.SelectedMember?.MgNr}.elwig.zip" : $"Mitglieder_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip",
-                    DefaultExt = ".elwig.zip",
+                    DefaultExt = "elwig.zip",
                     Filter = "Elwig-Export-Datei (*.elwig.zip)|*.elwig.zip",
-                    Title = $"{MemberList.Name} speichern unter - Elwig"
+                    Title = $"{MemberList.Name} speichern unter - Elwig",
+                    AddExtension = false,
                 };
                 if (d.ShowDialog() == true) {
+                    if (!d.FileName.EndsWith(".elwig.zip")) d.FileName += ".elwig.zip";
                     Mouse.OverrideCursor = Cursors.Wait;
                     await Task.Run(async () => {
                         try {
diff --git a/Elwig/Windows/MainWindow.xaml.cs b/Elwig/Windows/MainWindow.xaml.cs
index 275456e..374a205 100644
--- a/Elwig/Windows/MainWindow.xaml.cs
+++ b/Elwig/Windows/MainWindow.xaml.cs
@@ -158,8 +158,10 @@ namespace Elwig.Windows {
                     FileName = $"database_{Utils.Today:yyyy-MM-dd}.sql.zip",
                     DefaultExt = "sql.zip",
                     Filter = "Komprimierte SQL-Datei (*.sql.zip)|*.sql.zip",
+                    AddExtension = false,
                 };
                 if (d.ShowDialog() == true) {
+                    if (!d.FileName.EndsWith(".sql.zip")) d.FileName += ".sql.zip";
                     Mouse.OverrideCursor = Cursors.Wait;
                     await Task.Run(async () => {
                         await Database.ExportSql(d.FileName, true);