Index: branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r5613 -r5614
--- branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 5613)
+++ branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 5614)
@@ -41,9 +41,11 @@
 					
 					 	
 					a_toolbar.AddButton( new ToolBarButton('editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>', function() {
-							$edit_url = '<inp2:m_t t="categories/categories_edit" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
-							window.location.href = $edit_url.replace('#CATEGORY_ID#', get_hidden_field('m_cat_id'));
-								
+							var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
+							var $category_id = get_hidden_field('m_cat_id');
+							var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
+							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'categories/categories_edit' : 'categories/categories_edit_permissions');
+							redirect($redirect_url);
 							}
 						) );