Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -N -r11711 -r11748
--- branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11711)
+++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11748)
@@ -15,7 +15,7 @@
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
 	  		<inp2:m_include t="catalog/item_selector/item_selector_toolbar" is_catalog="1"/>
 	  		<script type="text/javascript">
-	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="type" type="item_selector" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'is_catalog_');
+	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="type" type="item_selector" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'is_catalog_', 'ItemSelectorCatalog');
 	  		</script>
 		</td>
 
Index: branches/RC/core/admin_templates/catalog/advanced_view.tpl
===================================================================
diff -u -N -r11724 -r11748
--- branches/RC/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 11724)
+++ branches/RC/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 11748)
@@ -35,7 +35,7 @@
 	  				this.switchTab();
 	  			}
 
-	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts,td" ts="showall" td="no" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'advanced_view_', 0);
+	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts,td" ts="showall" td="no" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'advanced_view_', 'AdvancedView');
 				var a_toolbar = new ToolBar();
 
 					<inp2:m_set ts="showall" td="no"/>
Index: branches/RC/core/admin_templates/js/catalog.js
===================================================================
diff -u -N -r11667 -r11748
--- branches/RC/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 11667)
+++ branches/RC/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 11748)
@@ -1,4 +1,5 @@
-function Catalog($url_mask, $cookie_prefix, $tab_shift) {
+function Catalog($url_mask, $cookie_prefix, $type) {
+	this.type = $type;
 	this.CookiePrefix = $cookie_prefix ? $cookie_prefix : '';
 	this.BusyRequest = new Array();
 	this.URLMask = $url_mask;
Index: branches/RC/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r11724 -r11748
--- branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11724)
+++ branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11748)
@@ -33,7 +33,7 @@
 
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 	  			var $is_catalog = true;
-	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'catalog_');
+	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'catalog_', 'Catalog');
 				$Catalog.TabByCategory = <inp2:m_if check="m_GetConfig" name="Catalog_PreselectModuleTab">true<inp2:m_else/>false</inp2:m_if>;
 
 				var a_toolbar = new ToolBar();
Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl
===================================================================
diff -u -N -r11711 -r11748
--- branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl	(.../item_selector_advanced_view.tpl)	(revision 11711)
+++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl	(.../item_selector_advanced_view.tpl)	(revision 11748)
@@ -21,7 +21,7 @@
 	  				this.switchTab();
 	  			}
 
-	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts,td,tm,type" type="item_selector" ts="showall" td="no" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'is_advanced_view_', 0);
+	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts,td,tm,type" type="item_selector" ts="showall" td="no" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'is_advanced_view_', 'ItemSelectorAdvancedView');
 			</script>
 		</td>
 
Index: branches/RC/core/admin_templates/reviews/reviews.tpl
===================================================================
diff -u -N -r11623 -r11748
--- branches/RC/core/admin_templates/reviews/reviews.tpl	(.../reviews.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/reviews/reviews.tpl	(.../reviews.tpl)	(revision 11748)
@@ -39,7 +39,7 @@
 					}
 				}
 
-	  			var $Catalog = new Catalog('<inp2:m_Link template="reviews/reviews_tab" item_prefix="#ITEM_PREFIX#" tab_name="#TAB_NAME#" pass_through="td,item_prefix,tab_name" td="no" m_cat_id="-1" no_amp="1"/>', 'reviews_', 0);
+	  			var $Catalog = new Catalog('<inp2:m_Link template="reviews/reviews_tab" item_prefix="#ITEM_PREFIX#" tab_name="#TAB_NAME#" pass_through="td,item_prefix,tab_name" td="no" m_cat_id="-1" no_amp="1"/>', 'reviews_', 'Reviews');
 				var a_toolbar = new ToolBar();
 
 					a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
Index: branches/RC/core/admin_templates/tree.tpl
===================================================================
diff -u -N -r11682 -r11748
--- branches/RC/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 11682)
+++ branches/RC/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 11748)
@@ -87,11 +87,17 @@
 
 	function setCatalogTab($prefix) {
 		var $ret = checkEditMode();
-		var $right_frame = getFrame('main');
-		if ($ret && typeof $right_frame.$Catalog != 'undefined') {
-			$right_frame.$Catalog.switchTab($prefix);
-			return 1; // this opens folder, but disables click
+
+		if ($ret) {
+			var $right_frame = getFrame('main');
+			var $catalog_type = (typeof $right_frame.$Catalog != 'undefined') ? $right_frame.$Catalog.type : '';
+
+			if ($catalog_type == 'AdvancedView') {
+				$right_frame.$Catalog.switchTab($prefix);
+				return 1; // this opens folder, but disables click
+			}
 		}
+
 		return $ret;
 	}
 
Index: branches/RC/core/admin_templates/users/user_edit_items.tpl
===================================================================
diff -u -N -r11623 -r11748
--- branches/RC/core/admin_templates/users/user_edit_items.tpl	(.../user_edit_items.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/users/user_edit_items.tpl	(.../user_edit_items.tpl)	(revision 11748)
@@ -41,7 +41,7 @@
 					}
 				}*/
 
-	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts" ts="user" pass="m,u" no_amp="1"/>', 'useritems_', 0);
+	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts" ts="user" pass="m,u" no_amp="1"/>', 'useritems_', 'UserItemEditor');
 
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
Index: branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl
===================================================================
diff -u -N -r11724 -r11748
--- branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 11724)
+++ branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 11748)
@@ -73,7 +73,7 @@
 					set_hidden_field('t', $prev_template);
 				}
 
-	  			var $PermManager = new Catalog('<inp2:m_Link template="categories/permissions_tab" item_prefix="#ITEM_PREFIX#" group_id="#GROUP_ID#" no_amp="1" pass="m,c"/>', 'permmanager_', 0);
+	  			var $PermManager = new Catalog('<inp2:m_Link template="categories/permissions_tab" item_prefix="#ITEM_PREFIX#" group_id="#GROUP_ID#" no_amp="1" pass="m,c"/>', 'permmanager_', 'CategoryPermissionEditor');
 
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {