diff --git a/Source/GUI/VCL/GUI_Main.cpp b/Source/GUI/VCL/GUI_Main.cpp
index c6c7b4446..a9dfe6cb2 100644
--- a/Source/GUI/VCL/GUI_Main.cpp
+++ b/Source/GUI/VCL/GUI_Main.cpp
@@ -1254,6 +1254,11 @@ void __fastcall TMainF::M_File_ExportClick(TObject *Sender)
             Name=Prefs->BaseFolder;
             Name.resize(Name.size()-1);
             Name=Name.substr(0, Name.rfind(__T("\\"))+1); //Folder of MediaInfo
+
+            //If only one file, use folder and filename of that file
+            if (I->Count_Get()==1) {
+                Name=I->Get(0, Stream_General, 0, __T("CompleteName")).c_str();
+            }
         }
         else
             Name=GUI_Text(OpenDialog1->InitialDir);