diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
index aa3f0e2ee3..6a9cf41300 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
@@ -76,8 +76,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				var mapDirectory = map.Path != null ? Platform.UnresolvePath(Path.GetDirectoryName(map.Path)) : null;
 				var initialDirectory = mapDirectories.Keys.FirstOrDefault(f => f == mapDirectory);
 
+				// Prioritize MapClassification.User directories over system directories
 				if (initialDirectory == null)
-					initialDirectory = mapDirectories.Keys.First();
+					initialDirectory = mapDirectories.OrderByDescending(kv => kv.Value).First().Key;
 
 				directoryDropdown.Text = initialDirectory;
 				directoryDropdown.OnClick = () =>