diff --git a/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.addin b/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.addin
index 3ac1c3d141..dcf08dfa17 100644
--- a/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.addin
+++ b/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.addin
@@ -23,6 +23,7 @@
 		     insertafter  = "Bookmarks"
 		     insertbefore = "DefinitionView"
 		     icon         = "CodeCoverage.Icons.16x16.Pad"
+		     shortcut     = "Control|Alt|G"
 		     class        = "ICSharpCode.CodeCoverage.CodeCoveragePad"/>
 	</Path>
 	
@@ -71,4 +72,21 @@
 		             label       = "${res:ICSharpCode.UnitTesting.CodeCoverage}"
 		             class       = "ICSharpCode.CodeCoverage.CodeCoverageProjectOptionsPanel"/>
 	</Path>
+
+	<Path name = "/SharpDevelop/Workbench/MainMenu/Edit/Format">
+		<MenuItem id          = "ShowCodeCoverage"
+		          insertafter = "Indent" 
+		          label       = "Show Code Co&amp;verage"
+		          type        = "CheckBox"
+		          class       = "ICSharpCode.CodeCoverage.ToggleCodeCoverageCommand"/>
+	</Path>
+
+	<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ContextMenu">
+		<MenuItem id           = "ShowCodeCoverage"
+		          insertafter  = "Indent" 
+		          insertbefore = "FileMode"
+		          label        = "Show Code Co&amp;verage"
+		          type         = "CheckBox"
+		          class        = "ICSharpCode.CodeCoverage.ToggleCodeCoverageCommand"/>
+	</Path>
 </AddIn>
diff --git a/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageService.cs b/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageService.cs
index 81f0eaa3ac..b33f57e04f 100644
--- a/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageService.cs
+++ b/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageService.cs
@@ -38,19 +38,19 @@ namespace ICSharpCode.CodeCoverage
 			}
 			set {
 				CodeCoveragePad pad = CodeCoveragePad.Instance;
-				if (pad != null) {
-					pad.UpdateToolbar();
-				}
 				if (CodeCoverageOptions.CodeCoverageHighlighted != value) {
 					CodeCoverageOptions.CodeCoverageHighlighted = value;
 					if (CodeCoverageResultsExist) {
-						if (CodeCoverageOptions.CodeCoverageHighlighted) {
+						if (value) {
 							ShowCodeCoverage();
 						} else {
 							HideCodeCoverage();
 						}
 					}
 				}
+				if (pad != null) {
+					pad.UpdateToolbar();
+				}
 			}
 		}