diff --git a/extern/nfd-modified/src/nfd_cocoa.mm b/extern/nfd-modified/src/nfd_cocoa.mm
index 036d383fb..8fe4f9d77 100644
--- a/extern/nfd-modified/src/nfd_cocoa.mm
+++ b/extern/nfd-modified/src/nfd_cocoa.mm
@@ -149,6 +149,12 @@ nfdresult_t NFD_OpenDialog( const std::vector<std::string>& filterList,
     // Set the starting directory
     SetDefaultPath(dialog, defaultPath);
 
+    // Set the file name
+    if (defaultFileName!=NULL) {
+      NSString* defFileName=[NSString stringWithUTF8String:defaultFileName];
+      [dialog setNameFieldStringValue:defFileName];
+    }
+
     nfdresult_t nfdResult = NFD_CANCEL;
     if ( [dialog runModal] == NSModalResponseOK )
     {
@@ -192,6 +198,12 @@ nfdresult_t NFD_OpenDialogMultiple( const std::vector<std::string>& filterList,
 
     // Set the starting directory
     SetDefaultPath(dialog, defaultPath);
+
+    // Set the file name
+    if (defaultFileName!=NULL) {
+      NSString* defFileName=[NSString stringWithUTF8String:defaultFileName];
+      [dialog setNameFieldStringValue:defFileName];
+    }
     
     nfdresult_t nfdResult = NFD_CANCEL;
     if ( [dialog runModal] == NSModalResponseOK )
@@ -239,6 +251,12 @@ nfdresult_t NFD_SaveDialog( const std::vector<std::string>& filterList,
     // Set the starting directory
     SetDefaultPath(dialog, defaultPath);
 
+    // Set the file name
+    if (defaultFileName!=NULL) {
+      NSString* defFileName=[NSString stringWithUTF8String:defaultFileName];
+      [dialog setNameFieldStringValue:defFileName];
+    }
+
     nfdresult_t nfdResult = NFD_CANCEL;
     if ( [dialog runModal] == NSModalResponseOK )
     {