Index: branches/5.0.x/core/admin_templates/tree.tpl
===================================================================
diff -u -r12117 -r12382
--- branches/5.0.x/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 12382)
@@ -91,16 +91,23 @@
 	}
 
 	function setCatalogTab($prefix) {
-		var $ret = checkEditMode();
+		var $ret = checkEditMode(false);
 
 		if ($ret) {
 			var $right_frame = getFrame('main');
 			var $catalog_type = (typeof $right_frame.$Catalog != 'undefined') ? $right_frame.$Catalog.type : '';
 
+			// highlight "Structure & Data" node, when one of it's shortcut nodes are clicked
+			<inp2:m_DefineElement name="section_url_element"><inp2:m_param name="section_url"/></inp2:m_DefineElement>
+			var $structure_node = the_tree.locateItemByURL('<inp2:adm_PrintSection render_as="section_url_element" section_name="in-portal:browse"/>');
+
 			if ($catalog_type == 'AdvancedView') {
 				$right_frame.$Catalog.switchTab($prefix);
-				return 1; // this opens folder, but disables click
+				return $structure_node; // this opens folder, but disables click
 			}
+
+			// this disabled click and causes other node to be highlighted
+			return $structure_node;
 		}
 
 		return $ret;