diff --git a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs
index 57ae7430..6e01ef9c 100644
--- a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs
+++ b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs
@@ -954,9 +954,14 @@ namespace UniversalEditor.UserInterface.WindowsForms
 		}
 		public void SaveProjectAs()
 		{
-			SolutionObjectModel solution = new SolutionObjectModel();
+			if (mvarCurrentSolution == null)
+			{
+				return;
+			}
+
 			SaveFileDialog sfd = new SaveFileDialog();
-			sfd.Filter = UniversalEditor.Common.Dialog.GetCommonDialogFilter(solution.MakeReference());
+			sfd.Filter = UniversalEditor.Common.Dialog.GetCommonDialogFilter(mvarCurrentSolution.MakeReference());
+			sfd.FileName = mvarCurrentSolution.Title + ".sln";
 			if (sfd.ShowDialog() == System.Windows.Forms.DialogResult.OK)
 			{
 				SaveProjectAs(sfd.FileName);