diff --git a/osx/boe.actions.cpp b/osx/boe.actions.cpp
index 7e917488..c541a65a 100644
--- a/osx/boe.actions.cpp
+++ b/osx/boe.actions.cpp
@@ -2154,7 +2154,7 @@ void do_save(short mode)
 		return;
 	}
 	fs::path file = univ.file;
-	if(mode == 1) file = nav_put_party();
+	if(mode == 1) file = nav_put_party(file);
 	if(!file.empty()) {
 		univ.file = file;
 		save_party(univ.file);
diff --git a/osx/tools/winutil.h b/osx/tools/winutil.h
index 8468debb..4adedf72 100644
--- a/osx/tools/winutil.h
+++ b/osx/tools/winutil.h
@@ -22,9 +22,9 @@ void setWindowFloating(sf::Window& win, bool floating);
 void init_fileio();
 
 fs::path nav_get_party();
-fs::path nav_put_party();
+fs::path nav_put_party(fs::path def = "");
 fs::path nav_get_scenario();
-fs::path nav_put_scenario();
+fs::path nav_put_scenario(fs::path def = "");
 
 void beep();
 
diff --git a/osx/tools/winutil.mac.mm b/osx/tools/winutil.mac.mm
index 54ddcc0d..456d2790 100644
--- a/osx/tools/winutil.mac.mm
+++ b/osx/tools/winutil.mac.mm
@@ -196,7 +196,12 @@ fs::path nav_get_scenario() {
 	return "";
 }
 
-fs::path nav_put_scenario() {
+fs::path nav_put_scenario(fs::path def) {
+	if(!def.empty()) {
+		// TODO: Hopefully requesting UTF-8 doesn't break anything...
+		[dlg_put_scen setNameFieldStringValue:[NSString stringWithUTF8String: def.filename().c_str()]];
+		[dlg_put_scen setDirectoryURL:[NSURL URLWithString:[NSString stringWithUTF8String: def.parent_path().c_str()]]];
+	}
 	bool gotFile = [dlg_put_scen runModal] != NSFileHandlingPanelCancelButton;
 	makeFrontWindow(mainPtr);
 	if(gotFile)
@@ -212,7 +217,12 @@ fs::path nav_get_party() {
 	return "";
 }
 
-fs::path nav_put_party() {
+fs::path nav_put_party(fs::path def) {
+	if(!def.empty()) {
+		// TODO: Hopefully requesting UTF-8 doesn't break anything...
+		[dlg_put_game setNameFieldStringValue:[NSString stringWithUTF8String: def.filename().c_str()]];
+		[dlg_put_game setDirectoryURL:[NSURL URLWithString:[NSString stringWithUTF8String: def.parent_path().c_str()]]];
+	}
 	bool gotFile = [dlg_put_game runModal] != NSFileHandlingPanelCancelButton;
 	makeFrontWindow(mainPtr);
 	if(gotFile)