diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/ClassBrowserSupport.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/ClassBrowserSupport.cs
index 8bfd17cf10..c64f58d09a 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Pads/ClassBrowserSupport.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/ClassBrowserSupport.cs
@@ -135,6 +135,11 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 			}
 		}
 		
+		public override void ShowContextMenu()
+		{
+			// Don't show context menu as for usual AssemblyTreeNodes.
+		}
+		
 		static IAssemblyModel CreateAssemblyModel(Module module)
 		{
 			// references??
diff --git a/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml b/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml
index ae78f0982f..44117a28f2 100644
--- a/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml
+++ b/src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml
@@ -4,7 +4,7 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
 	Title="Open From GAC"
-	Style="{DynamicResource DialogWindow}"
+	Style = "{x:Static core:GlobalStyles.DialogWindowStyle}"
 	WindowStartupLocation="CenterOwner"
 	ResizeMode="CanResizeWithGrip"
 	MinWidth="200"