Index: branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl
===================================================================
diff -u -N -r14853 -r14929
--- branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl	(.../promo_block_edit.tpl)	(revision 14853)
+++ branches/5.2.x/core/admin_templates/promo_blocks/promo_block_edit.tpl	(.../promo_block_edit.tpl)	(revision 14929)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="700" height="585"/>
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_RenderElement name="combined_header" section="in-portal:promo_blocks"  prefix="promo-block" title_preset="promo_block_edit"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:promo_block_groups" prefix="promo-block" title_preset="promo_block_edit"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -78,6 +78,7 @@
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="inp_id_label" prefix="promo-block" field="BlockId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="promo-block" field="PromoBlockGroupId" title="la_fld_PromoBlockGroup" has_empty="1"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="promo-block" field="Title" maxlength="50"/>
 		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="promo-block" field="Html" title="la_fld_Text" control_options="{min_height: 60}" rows="4" cols="70"/>