diff --git a/Source/Core/Windows/MapOptionsForm.cs b/Source/Core/Windows/MapOptionsForm.cs
index 2d1deca33588c48a116e8af968eef7c7615af7a2..33354c3d5be15fb9c35ac07db0a280dfa429c51d 100755
--- a/Source/Core/Windows/MapOptionsForm.cs
+++ b/Source/Core/Windows/MapOptionsForm.cs
@@ -188,6 +188,12 @@ namespace CodeImp.DoomBuilder.Windows
 				datalocations.Focus();
 				return;
 			}
+
+			// Save the last used config when creating a new map
+			if (newmap)
+			{
+				General.Settings.LastUsedConfigName = configinfo.Name;
+			}
 			
 			// Next checks are only for maps that are already opened
 			if(!newmap)