diff --git a/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs b/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs
index 3f6b8566fa..6939edfd22 100644
--- a/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs
+++ b/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs
@@ -52,6 +52,10 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 		
 		static string FindSHFB()
 		{
+			string envVar = Environment.GetEnvironmentVariable("SHFBROOT");
+			if (!string.IsNullOrEmpty(envVar)) {
+				return Path.Combine(envVar, "SandcastleBuilderGUI.exe");
+			}
 			foreach (string registryKey in registryKeys) {
 				string fileName = FindSHFB(registryKey);
 				if (fileName != null) {
diff --git a/src/Main/StartUp/Project/app.template.config b/src/Main/StartUp/Project/app.template.config
index e40b47eeb9..ea8bc3c92a 100644
--- a/src/Main/StartUp/Project/app.template.config
+++ b/src/Main/StartUp/Project/app.template.config
@@ -3,20 +3,25 @@
 		<section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
 	</configSections>
 	
+	<!--
+		
+		WARNING!
+		
+		This file is automatically generated and will be overwritten every time SharpDevelop is compiled.
+		Change the template file "app.template.config" instead!
+		
+	-->
+	
 	<startup useLegacyV2RuntimeActivationPolicy="true">
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
 	</startup>
 	
 	<runtime>
-		<!--
-			
-			WARNING!
-			
-			This file is automatically generated and will be overwritten every time SharpDevelop is compiled.
-			Change the template file "app.template.config" instead!
-			
-		-->
+		<!-- This option allows running SharpDevelop from network drives -->
+		<loadFromRemoteSources enabled="true" />
+		
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<!-- The redirects for SharpDevelop allow using old AddIns in newer SharpDevelop versions -->
 			<dependentAssembly>
 				<assemblyIdentity name="ICSharpCode.Core" publicKeyToken="f829da5c02be14ee" culture="neutral"/>
 				<bindingRedirect oldVersion="4.0.0.0-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>