Index: branches/5.2.x/core/admin_templates/config/config_search.tpl
===================================================================
diff -u -N -r16062 -r16570
--- branches/5.2.x/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 16062)
+++ branches/5.2.x/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 16570)
@@ -129,14 +129,16 @@
 
 <inp2:m_RenderElement name="config_updated_notice"/>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered"<inp2:m_if check="conf_ShowRelevance"> style="border-bottom-width: 0px;"</inp2:m_if>>
-	<inp2:confs_PrintList render_as="confs_detail_row" />
-</table>
+<div id="scroll_container">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered"<inp2:m_if check="conf_ShowRelevance"> style="border-bottom-width: 0px;"</inp2:m_if>>
+		<inp2:confs_PrintList render_as="confs_detail_row" />
+	</table>
 
-<inp2:m_if check="conf_ShowRelevance">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
-	<inp2:conf_PrintConfList block="config_values" per_page="-1"/>
-</table>
-</inp2:m_if>
+	<inp2:m_if check="conf_ShowRelevance">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
+		<inp2:conf_PrintConfList block="config_values" per_page="-1"/>
+	</table>
+	</inp2:m_if>
+</div>
 
 <inp2:m_include t="incs/footer"/>