diff --git a/src/AddIns/Misc/HelpViewer/HelpViewer.addin b/src/AddIns/Misc/HelpViewer/HelpViewer.addin
index d8f3bbacf3..f7dabbaa78 100644
--- a/src/AddIns/Misc/HelpViewer/HelpViewer.addin
+++ b/src/AddIns/Misc/HelpViewer/HelpViewer.addin
@@ -15,15 +15,19 @@
 		<BrowserSchemeExtension id = "ms-xhelp" class = "MSHelpSystem.BrowserScheme"/>
 	</Path>
 
-	<Path path = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-		<OptionPanel id = "Help3Options" label = "Microsoft Help System v1.0" class = "MSHelpSystem.Help3OptionsPanel" />
+	<Path name="/SharpDevelop/Pads/ErrorList/TaskContextMenu">
+		<MenuItem id = "Help3ShowErrorHelp" label = "Show Help" class = "MSHelpSystem.Commands.ShowErrorHelpCommand" />
+	</Path>
+	
+	<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.SharpDevelopMenu.DisplayCatalogCommand"
-		          label       = "Display Help catalog"
-		          shortcut    = "Control|Alt|F1"
-		          insertafter = "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/HelpViewer.csproj b/src/AddIns/Misc/HelpViewer/HelpViewer.csproj
index 98523e3a7b..5c45971815 100644
--- a/src/AddIns/Misc/HelpViewer/HelpViewer.csproj
+++ b/src/AddIns/Misc/HelpViewer/HelpViewer.csproj
@@ -89,7 +89,7 @@
     <Compile Include="Source\Helper\Help3Configuration.cs" />
     <Compile Include="Source\Helper\HelpClientWatcher.cs" />
     <Compile Include="Source\Helper\ProjectLanguages.cs" />
-    <Compile Include="Source\HelpMenu.cs" />
+    <Compile Include="Source\Commands.cs" />
     <Compile Include="Source\MSHelp3Provider.cs" />
     <Compile Include="Source\Core\NativeMethods.cs" />
   </ItemGroup>
diff --git a/src/AddIns/Misc/HelpViewer/Source/Commands.cs b/src/AddIns/Misc/HelpViewer/Source/Commands.cs
new file mode 100644
index 0000000000..a995218494
--- /dev/null
+++ b/src/AddIns/Misc/HelpViewer/Source/Commands.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using MSHelpSystem.Core;
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
+using ICSharpCode.SharpDevelop.Gui;
+
+namespace MSHelpSystem.Commands
+{
+	// <owner name="Siegfried Pammer" email="sie_pam@gmx.at"/>
+	// <version>$Revision: 3555 $</version>
+	public class ShowErrorHelpCommand : AbstractMenuCommand
+	{
+		public override void Run()
+		{
+			ICSharpCode.SharpDevelop.Gui.TaskView view = (TaskView)Owner;
+
+			foreach (Task t in new List<Task>(view.SelectedTasks)) {
+				if (t.BuildError == null)
+					continue;
+
+				string code = t.BuildError.ErrorCode;
+				if (string.IsNullOrEmpty(code))
+					return;
+
+				if (Help3Environment.IsHelp3ProtocolRegistered) {
+					LoggingService.Debug(string.Format("Help 3.0: Getting description of \"{0}\"", code));
+					if (Help3Environment.IsLocalHelp)
+						DisplayHelp.Keywords(code);
+					else
+						DisplayHelp.ContextualHelp(code);
+				}
+				else {
+					LoggingService.Error("Help 3.0: Help system ist not initialized");
+				}
+			}
+		}
+	}
+
+	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/HelpMenu.cs b/src/AddIns/Misc/HelpViewer/Source/HelpMenu.cs
deleted file mode 100644
index f74794306e..0000000000
--- a/src/AddIns/Misc/HelpViewer/Source/HelpMenu.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using MSHelpSystem.Core;
-using ICSharpCode.Core;
-
-namespace MSHelpSystem.SharpDevelopMenu
-{
-	public class DisplayCatalogCommand : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			LoggingService.Info("Help 3.0: Calling menu command \"DisplayHelp.Catalog()\"");
-			DisplayHelp.Catalog();
-		}
-	}
-}