diff --git a/Signal-Windows.Lib/SignalLibHandle.cs b/Signal-Windows.Lib/SignalLibHandle.cs
index a3396ad..b580c88 100644
--- a/Signal-Windows.Lib/SignalLibHandle.cs
+++ b/Signal-Windows.Lib/SignalLibHandle.cs
@@ -530,6 +530,11 @@ public async Task ExportAttachment(SignalAttachment sa)
                     SuggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.Downloads,
                     SuggestedFileName = sa.SentFileName ?? "signal"
                 };
+                string extension = Path.GetExtension(savePicker.SuggestedFileName);
+                if (!string.IsNullOrWhiteSpace(extension))
+                {
+                    savePicker.FileTypeChoices.Add(extension.TrimStart('.').ToUpper(), new List<string>() { extension });
+                }
                 savePicker.FileTypeChoices.Add("Any", new List<string>() { "." });
                 var target_file = await savePicker.PickSaveFileAsync();
                 if (target_file != null)