diff --git a/src/AddIns/Misc/HelpViewer/HelpViewer.addin b/src/AddIns/Misc/HelpViewer/HelpViewer.addin
index 163c65ebe4..7f715f7c0d 100644
--- a/src/AddIns/Misc/HelpViewer/HelpViewer.addin
+++ b/src/AddIns/Misc/HelpViewer/HelpViewer.addin
@@ -22,12 +22,4 @@
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
 		<OptionPanel id = "Help3Options" label = "Microsoft Help Viewer" class = "MSHelpSystem.Help3OptionsPanel" />
 	</Path>
-
-	<Path name = "/SharpDevelop/Workbench/MainMenu/Help">
-		<MenuItem id           = "Help3DisplayCatalog"
-		          class        = "MSHelpSystem.Commands.DisplayCatalogCommand"
-		          label        = "Display Help catalog"
-		          shortcut     = "Control|Alt|F1"
-		          insertbefore = "Separator1" />
-	</Path>
 </AddIn>
diff --git a/src/AddIns/Misc/HelpViewer/Source/Commands.cs b/src/AddIns/Misc/HelpViewer/Source/Commands.cs
index a995218494..940bd081bf 100644
--- a/src/AddIns/Misc/HelpViewer/Source/Commands.cs
+++ b/src/AddIns/Misc/HelpViewer/Source/Commands.cs
@@ -36,13 +36,4 @@ namespace MSHelpSystem.Commands
 			}
 		}
 	}
-
-	public class DisplayCatalogCommand : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			LoggingService.Info("Help 3.0: Calling menu command \"DisplayHelp.Catalog()\"");
-			DisplayHelp.Catalog();
-		}
-	}
 }
diff --git a/src/AddIns/Misc/HelpViewer/Source/Core/DisplayHelp.cs b/src/AddIns/Misc/HelpViewer/Source/Core/DisplayHelp.cs
index 26053d74fe..7921dcc839 100644
--- a/src/AddIns/Misc/HelpViewer/Source/Core/DisplayHelp.cs
+++ b/src/AddIns/Misc/HelpViewer/Source/Core/DisplayHelp.cs
@@ -10,7 +10,7 @@ using MSHelpSystem.Helper;
 
 namespace MSHelpSystem.Core
 {
-	internal sealed class DisplayHelp
+	public sealed class DisplayHelp
 	{
 		DisplayHelp()
 		{
@@ -89,7 +89,7 @@ namespace MSHelpSystem.Core
 			if (catalog == null) {
 				throw new ArgumentNullException("c");
 			}
-			string helpSearchUrl = string.Format(@"ms-xhelp://method=search&query={3}&product={0}&productVersion={1}&locale={2}",
+			string helpSearchUrl = string.Format(@"ms-xhelp://?method=search&query={3}&product={0}&productVersion={1}&locale={2}",
 			                                     catalog.ProductCode, catalog.ProductVersion, catalog.Locale, searchWords.Replace(" ", "+"));
 			LoggingService.Debug(string.Format("Help 3.0: {0}", helpSearchUrl));
 			DisplayLocalHelp(helpSearchUrl);
@@ -121,7 +121,7 @@ namespace MSHelpSystem.Core
 		static void DisplayLocalHelp(string arguments)
 		{
 			// TODO: set "embedded" to TRUE if we have a TOC control or something similar
-			DisplayLocalHelp(arguments, false);
+			DisplayLocalHelp(arguments, true);
 		}
 
 		static void DisplayLocalHelp(string arguments, bool embedded)
diff --git a/src/AddIns/Misc/HelpViewer/Source/Core/Help3Environment.cs b/src/AddIns/Misc/HelpViewer/Source/Core/Help3Environment.cs
index b228e3e9a8..471d4b8ccb 100644
--- a/src/AddIns/Misc/HelpViewer/Source/Core/Help3Environment.cs
+++ b/src/AddIns/Misc/HelpViewer/Source/Core/Help3Environment.cs
@@ -7,7 +7,7 @@ using MSHelpSystem.Helper;
 
 namespace MSHelpSystem.Core
 {
-	internal sealed class Help3Environment
+	public sealed class Help3Environment
 	{
 		Help3Environment()
 		{
diff --git a/src/AddIns/Misc/HelpViewer/Source/Core/HelpLibraryAgent.cs b/src/AddIns/Misc/HelpViewer/Source/Core/HelpLibraryAgent.cs
index 5597ad7dac..2625d1f7ad 100644
--- a/src/AddIns/Misc/HelpViewer/Source/Core/HelpLibraryAgent.cs
+++ b/src/AddIns/Misc/HelpViewer/Source/Core/HelpLibraryAgent.cs
@@ -6,7 +6,7 @@ using ICSharpCode.Core;
 
 namespace MSHelpSystem.Core
 {
-	internal sealed class HelpLibraryAgent
+	public sealed class HelpLibraryAgent
 	{
 		HelpLibraryAgent()
 		{
diff --git a/src/AddIns/Misc/HelpViewer/Source/Core/HelpLibraryManager.cs b/src/AddIns/Misc/HelpViewer/Source/Core/HelpLibraryManager.cs
index c13e564e59..856af88236 100644
--- a/src/AddIns/Misc/HelpViewer/Source/Core/HelpLibraryManager.cs
+++ b/src/AddIns/Misc/HelpViewer/Source/Core/HelpLibraryManager.cs
@@ -7,7 +7,7 @@ using ICSharpCode.Core;
 
 namespace MSHelpSystem.Core
 {
-	internal sealed class HelpLibraryManager
+	public sealed class HelpLibraryManager
 	{
 		HelpLibraryManager()
 		{