diff --git a/src/Main/Base/Project/Dom/ClassBrowser/ClassBrowserTreeView.cs b/src/Main/Base/Project/Dom/ClassBrowser/ClassBrowserTreeView.cs
index 3550079e04..2ccebe401d 100644
--- a/src/Main/Base/Project/Dom/ClassBrowser/ClassBrowserTreeView.cs
+++ b/src/Main/Base/Project/Dom/ClassBrowser/ClassBrowserTreeView.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.Diagnostics;
+using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 using ICSharpCode.Core.Presentation;
 using ICSharpCode.TreeView;
 using ICSharpCode.SharpDevelop.Workbench;
@@ -33,6 +35,20 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 				}
 			}
 		}
+		
+		protected override void OnMouseUp(System.Windows.Input.MouseButtonEventArgs e)
+		{
+			if (e.ChangedButton == MouseButton.Right) {
+				var treeNode = this.SelectedItem as ModelCollectionTreeNode;
+				if (treeNode != null) {
+					var model = treeNode.Model;
+					if (model is IEntityModel) {
+						var ctx = MenuService.ShowContextMenu(e.Source as UIElement, (IEntityModel) model, "/SharpDevelop/EntityContextMenu");
+						e.Handled = true;
+					}
+				}
+			}
+		}
 	}
 	
 	public interface IClassBrowserTreeView