diff --git a/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs b/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs
index 15e534e22d..8cf01ad69a 100644
--- a/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs
+++ b/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs
@@ -49,9 +49,25 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 	
 	public class GenerateProjectDocumentation : AbstractMenuCommand
 	{
+		static string[] registryKeys = new string[] {
+			@"HKEY_CLASSES_ROOT\Sandcastle Help File Builder Project\shell\open\command",
+			@"HKEY_CLASSES_ROOT\SandcastleBuilder.shfbproj\shell\open\command"
+		};
+		
 		static string FindSHFB()
 		{
-			string command = Registry.GetValue(@"HKEY_CLASSES_ROOT\Sandcastle Help File Builder Project\shell\open\command", null, string.Empty) as string;
+			foreach (string registryKey in registryKeys) {
+				string fileName = FindSHFB(registryKey);
+				if (fileName != null) {
+					return fileName;
+				}
+			}
+			return null;
+		}
+		
+		static string FindSHFB(string registryKey)
+		{
+			string command = Registry.GetValue(registryKey, null, string.Empty) as string;
 			return ExtractExecutableFromCommand(command);
 		}