diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.cs
index 32b4351b7c..798e4253ee 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.cs
@@ -399,9 +399,10 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 		/// </summary>
 		public void BrowseForFolder(ProjectProperty<string> property, string description)
 		{
-			string newValue = BrowseForFolder(description, BaseDirectory, property.TextBoxEditMode);
-			if (newValue != null)
-				property.Value = newValue;
+			string path = BrowseForFolder(description, BaseDirectory, property.TextBoxEditMode);
+			if (!String.IsNullOrEmpty(path)) {
+				property.Value = path;
+			}	
 		}
 		
 		/// <summary>
@@ -411,26 +412,24 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 		/// <param name="startLocation">Start location, relative to the <see cref="BaseDirectory"/></param>
 		/// <param name="textBoxEditMode">The TextBoxEditMode used for the text box containing the file name</param>
 		/// <returns>Returns the location of the folder; or null if the dialog was cancelled.</returns>
-		protected string BrowseForFolder(string description, string startLocation, TextBoxEditMode textBoxEditMode)
+		private string BrowseForFolder(string description, string startLocation, TextBoxEditMode textBoxEditMode)
 		{
 			string startAt = GetInitialDirectory(startLocation, textBoxEditMode, false);
-			using (var fdiag = FileService.CreateFolderBrowserDialog(description, startAt))
-			{
-				if (fdiag.ShowDialog() == System.Windows.Forms.DialogResult.OK) {
-					string path = fdiag.SelectedPath;
-					if (!String.IsNullOrEmpty(startLocation)) {
-						path = FileUtility.GetRelativePath(startLocation, path);
-					}
-					if (!path.EndsWith("\\", StringComparison.Ordinal) && !path.EndsWith("/", StringComparison.Ordinal))
-						path += "\\";
-					if (textBoxEditMode == TextBoxEditMode.EditEvaluatedProperty) {
-						return path;
-					} else {
-						return MSBuildInternals.Escape(path);
-					}
+			string path = SD.FileService.BrowseForFolder(description,startAt);
+			if (String.IsNullOrEmpty(path)) {
+				return null;
+			} else {
+				if (!String.IsNullOrEmpty(startLocation)) {
+					path = FileUtility.GetRelativePath(startLocation, path);
+				}
+				if (!path.EndsWith("\\", StringComparison.Ordinal) && !path.EndsWith("/", StringComparison.Ordinal))
+					path += "\\";
+				if (textBoxEditMode == TextBoxEditMode.EditEvaluatedProperty) {
+					return path;
+				} else {
+					return MSBuildInternals.Escape(path);
 				}
 			}
-			return null;
 		}
 		
 		/// <summary>