Index: dojo-release-1.3.2-src/dijit/Tree.js
===================================================================
--- dojo-release-1.3.2-src.orig/dijit/Tree.js	2009-11-10 02:35:32.000000000 -0800
+++ dojo-release-1.3.2-src/dijit/Tree.js	2009-11-10 02:35:37.000000000 -0800
@@ -367,6 +367,17 @@
 		this.selected = selected;
 	},
 
+
+	_setContextMenuOpenedAttr: function(/*Boolean*/ open){
+		// summary:
+		//		Mark the label as ContextMenuOpened
+		var labelNode = this.labelNode;
+		//dijit.setWaiState(labelNode, "focused", open);
+		dojo.toggleClass(this.labelNode, "dijitTreeLabelContextMenuOpened", open);
+
+		this.contextMenuOpened = open;
+	},
+
 	_onMouseEnter: function(evt){
 		// summary:
 		//		Handler for onmouseenter event on a node
@@ -1035,7 +1046,18 @@
 		// tags:
 		//		callback
 	},
-
+	onContextMenu: function(/* dojo.data */ item, /*TreeNode*/ node){
+		// summary:
+		//		Callback when context menu is triggered (right click)
+		// tags:
+		//		callback
+	},
+	onContextMenuClose: function(/* dojo.data */ item, /*TreeNode*/ node){
+		// summary:
+		//		Convenience callback that fires when any item is blurred or selected.
+		// tags:
+		//		callback
+	},
 	_getNextNode: function(node){
 		// summary:
 		//		Get next visible node
@@ -1157,6 +1179,33 @@
 		}
 	},
 
+	_onContextMenu: function(/* Event */ e){
+		// summary:
+		//		User right clicks
+		dojo.stopEvent(e);
+
+		var domElement = e.target;
+		var nodeWidget = dijit.getEnclosingWidget(domElement);	
+		if(!nodeWidget || !nodeWidget.isTreeNode){
+			return;
+		}
+
+		nodeWidget.attr('contextMenuOpened', true);
+		this.onContextMenu(nodeWidget.item, nodeWidget);
+
+		var _handles = [];
+		_handles.push(dojo.connect(nodeWidget, 'onClick', this, function(){
+			dojo.forEach(_handles, dojo.disconnect);
+			this.onContextMenuClose(nodeWidget.item, nodeWidget);
+			nodeWidget.attr('contextMenuOpened', false);
+		}));
+		_handles.push(dojo.connect(nodeWidget, 'onBlur', this, function(){
+			dojo.forEach(_handles, dojo.disconnect);
+			this.onContextMenuClose(nodeWidget.item, nodeWidget);
+			nodeWidget.attr('contextMenuOpened', false);
+		}));
+	},
+
 	////////////////// Miscellaneous functions ////////////////
 
 	focusNode: function(/* _tree.Node */ node){
Index: dojo-release-1.3.2-src/dijit/templates/Tree.html
===================================================================
--- dojo-release-1.3.2-src.orig/dijit/templates/Tree.html	2009-11-10 02:34:00.000000000 -0800
+++ dojo-release-1.3.2-src/dijit/templates/Tree.html	2009-11-10 02:35:37.000000000 -0800
@@ -1,3 +1,3 @@
 <div class="dijitTreeContainer" waiRole="tree"
-	dojoAttachEvent="onclick:_onClick,onkeypress:_onKeyPress,ondblclick:_onDblClick">
+	dojoAttachEvent="onclick:_onClick,onkeypress:_onKeyPress,ondblclick:_onDblClick,oncontextmenu:_onContextMenu">
 </div>
Index: dojo-release-1.3.2-src/dijit/tests/tree/test_Tree_v1.html
===================================================================
--- dojo-release-1.3.2-src.orig/dijit/tests/tree/test_Tree_v1.html	2009-11-10 02:34:00.000000000 -0800
+++ dojo-release-1.3.2-src/dijit/tests/tree/test_Tree_v1.html	2009-11-10 02:35:37.000000000 -0800
@@ -86,22 +86,21 @@
 	<div dojoType="dijit.Tree" id="tree2" store="continentStore" query="{type:'continent'}">
 		<script type="dojo/connect">
 			var menu = dijit.byId("tree_menu");
-			// when we right-click anywhere on the tree, make sure we open the menu
-			menu.bindDomNode(this.domNode);
-
-			dojo.connect(menu, "_openMyself", this, function(e){
-				// get a hold of, and log out, the tree node that was the source of this open event
-				var tn = dijit.getEnclosingWidget(e.target);
-				console.debug(tn);
-
-				// now inspect the data store item that backs the tree node:
-				console.debug(tn.item);
+			var tree = dijit.byId("tree2");
+			tree.connect(tree, 'onContextMenu', function(item, widget){
+				console.log('onContextMenu');
+				dijit.popup.open({popup: menu, parent: widget, around: widget.labelNode});
 
 				// contrived condition: if this tree node doesn't have any children, disable all of the menu items
-				menu.getChildren().forEach(function(i){ i.attr('disabled', !tn.item.children); });
+				menu.getChildren().forEach(function(i){ i.attr('disabled', !item.children); });
+				menu.focus();
 
 				// IMPLEMENT CUSTOM MENU BEHAVIOR HERE
 			});
+			tree.connect(tree, 'onContextMenuClose', function(item, widget){
+				console.log('onContextMenuClose');
+				dijit.popup.close(menu);
+			});
 		</script>
 		<script type="dojo/method" event="getIconClass" args="item, opened">
            return (!item || continentStore.getValue(item, "type") == "continent") ?
Index: dojo-release-1.3.2-src/dijit/tests/test_Tree.html
===================================================================
--- dojo-release-1.3.2-src.orig/dijit/tests/test_Tree.html	2009-11-10 02:34:00.000000000 -0800
+++ dojo-release-1.3.2-src/dijit/tests/test_Tree.html	2009-11-10 02:35:37.000000000 -0800
@@ -97,22 +97,19 @@
 
 		<script type="dojo/connect">
 			var menu = dijit.byId("tree_menu");
-			// when we right-click anywhere on the tree, make sure we open the menu
-			menu.bindDomNode(this.domNode);
-
-			dojo.connect(menu, "_openMyself", this, function(e){
-				// get a hold of, and log out, the tree node that was the source of this open event
-				var tn = dijit.getEnclosingWidget(e.target);
-				console.debug(tn);
-
-				// now inspect the data store item that backs the tree node:
-				console.debug(tn.item);
+			this.connect(this, 'onContextMenu', function(item, widget){
+				dijit.popup.open({popup: menu, parent: widget, around: widget.labelNode});
 
 				// contrived condition: if this tree node doesn't have any children, disable all of the menu items
-				menu.getChildren().forEach(function(i){ i.attr('disabled', !tn.item.children); });
+				menu.getChildren().forEach(function(i){ i.attr('disabled', !item.children); });
+				menu.focus();
 
 				// IMPLEMENT CUSTOM MENU BEHAVIOR HERE
 			});
+
+			this.connect(this, 'onContextMenuClose', function(item, widget){
+				dijit.popup.close(menu);
+			});
 		</script>
 		<script type="dojo/method" event="getIconClass" args="item, opened">
            return (item == this.model.root || continentStore.getValue(item, "type") == "continent") ?