Index: branches/5.2.x/core/admin_templates/config/config_universal.tpl
===================================================================
diff -u -N -r16456 -r16570
--- branches/5.2.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 16456)
+++ branches/5.2.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 16570)
@@ -115,9 +115,11 @@
 <inp2:m_RenderElement name="config_updated_notice"/>
 <inp2:conf_SaveWarning name="grid_save_warning"/>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
-	<inp2:conf_PrintList list_name="default" block="config_block" full_block="config_block" half_block1="config_block1" half_block2="config_block2" value_render_as="cf_default_value"/>
-</table>
+<div id="scroll_container">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
+		<inp2:conf_PrintList list_name="default" block="config_block" full_block="config_block" half_block1="config_block1" half_block2="config_block2" value_render_as="cf_default_value"/>
+	</table>
+</div>
 
 <script type="text/javascript">
 	<inp2:m_if check="m_Get" name="refresh_tree">