diff --git a/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitleDownloadComponent.java b/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitleDownloadComponent.java
index bdeb0f1e..a3e451ed 100644
--- a/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitleDownloadComponent.java
+++ b/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitleDownloadComponent.java
@@ -343,7 +343,12 @@ class SubtitleDownloadComponent extends JComponent {
 					
 					for (Object object : selection) {
 						MemoryFile file = (MemoryFile) object;
-						File destination = new File(folder, validateFileName(file.getName()));
+						
+						// normalize name and auto-adjust extension
+						String ext = sf.getSelectedFormat().getFilter().extensions()[0];
+						String name = validateFileName(getNameWithoutExtension(file.getName()));
+						File destination = new File(folder, name + "." + ext);
+						
 						exportSubtitles(decodeSubtitles(file), destination, sf.getSelectedEncoding(), sf.getSelectedFormat(), sf.getTimingOffset());
 					}
 				}