Index: branches/5.1.x/core/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -r14241 -r14484
--- branches/5.1.x/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 14241)
+++ branches/5.1.x/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 14484)
@@ -75,4 +75,16 @@
 	</inp2:m_if>
 
 	$menu_frame.SyncActive('<inp2:m_t pass="m" m_opener="r"/>');
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="reflect_catalog_buttons">
+	<inp2:m_if check="c_ModuleRootCategory">
+		a_toolbar.DisableButton('upcat');
+		a_toolbar.DisableButton('homecat');
+	<inp2:m_else/>
+		a_toolbar.EnableButton('upcat');
+		a_toolbar.EnableButton('homecat');
+	</inp2:m_if>
+
+	$Catalog.reflectPasteButton(<inp2:c_HasClipboard/>);
 </inp2:m_DefineElement>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r14241 -r14484
--- branches/5.1.x/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 14241)
+++ branches/5.1.x/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 14484)
@@ -73,16 +73,8 @@
 		<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
 
 		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
+		<inp2:m_RenderElement name="reflect_catalog_buttons"/>
 
-		<inp2:m_if check="{$prefix}_ModuleRootCategory">
-			a_toolbar.DisableButton('upcat');
-			a_toolbar.DisableButton('homecat');
-		<inp2:m_else/>
-			a_toolbar.EnableButton('upcat');
-			a_toolbar.EnableButton('homecat');
-		</inp2:m_if>
-		$Catalog.reflectPasteButton(<inp2:$prefix_HasClipboard/>);
-
 		<inp2:m_if check="m_Recall" name="root_delete_error">
 			alert('<inp2:m_Phrase name="la_error_RootCategoriesDelete"/>');
 			<inp2:m_RemoveVar name="root_delete_error"/>