Index: trunk/kernel/admin_templates/incs/ajax.js
===================================================================
diff -u -r5064 -r5073
--- trunk/kernel/admin_templates/incs/ajax.js	(.../ajax.js)	(revision 5064)
+++ trunk/kernel/admin_templates/incs/ajax.js	(.../ajax.js)	(revision 5073)
@@ -31,7 +31,6 @@
 				Request.hideProgress(p_progId);
 			}
 		}
-		
 		var $ajax_mark = (p_url.indexOf('?') ? '&' : '?') + 'ajax=yes';
 		req.open(Request.method, p_url + $ajax_mark, true);
 		
Index: trunk/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r5061 -r5073
--- trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 5061)
+++ trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 5073)
@@ -158,7 +158,8 @@
 				<tr>
 					<td>Search:&nbsp;</td>
 					<td>
-						<input type="text" id="c_search_keyword" name="c_search_keyword" value="" PrefixSpecial="c" Grid="Default" style="border: 1px solid grey;">
+						<input type="text" id="c_search_keyword" name="c_search_keyword" value="" PrefixSpecial="c" Grid="Default" ajax="1" style="border: 1px solid grey;">
+						<input type="text" style="display: none"; />
 					</td>
 					<td id="search_buttons[c]">
 						<script type="text/javascript">
@@ -171,7 +172,7 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" edit_template="categories/categories_edit" dep_buttons=""></div>
+<div id="categories_div" prefix="c" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <inp2:m_set t="catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
Index: trunk/kernel/admin_templates/incs/script.js
===================================================================
diff -u -r5072 -r5073
--- trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 5072)
+++ trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 5073)
@@ -499,12 +499,11 @@
 
 function search_keydown($event)
 {
-	if(!$event && window.event) $event = window.event;
-	if($event.keyCode == 13)
-	{
+	$event = $event ? $event : event;
+	if ($event.keyCode == 13) {
 		var $prefix_special = this.getAttribute('PrefixSpecial');
 		var $grid = this.getAttribute('Grid');
-		search($prefix_special,$grid);
+		search($prefix_special, $grid, this.getAttribute('ajax'));
 	}
 }
 
Index: trunk/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -r5061 -r5073
--- trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 5061)
+++ trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 5073)
@@ -158,7 +158,8 @@
 				<tr>
 					<td>Search:&nbsp;</td>
 					<td>
-						<input type="text" id="c_search_keyword" name="c_search_keyword" value="" PrefixSpecial="c" Grid="Default" style="border: 1px solid grey;">
+						<input type="text" id="c_search_keyword" name="c_search_keyword" value="" PrefixSpecial="c" Grid="Default" ajax="1" style="border: 1px solid grey;">
+						<input type="text" style="display: none"; />
 					</td>
 					<td id="search_buttons[c]">
 						<script type="text/javascript">
@@ -171,7 +172,7 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" edit_template="categories/categories_edit" dep_buttons=""></div>
+<div id="categories_div" prefix="c" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <inp2:m_set t="catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
Index: trunk/kernel/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r5072 -r5073
--- trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 5072)
+++ trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 5073)
@@ -34,9 +34,9 @@
 			</td>
 			<inp2:m_if check="m_ParamEquals" param="search" value="on">
 				<inp2:m_if check="m_ParamEquals" name="SearchPrefixSpecial" value="">
-					<inp2:m_RenderElement name="grid_search" grid="$grid" PrefixSpecial="$PrefixSpecial"/>
+					<inp2:m_RenderElement name="grid_search" grid="$grid" PrefixSpecial="$PrefixSpecial" ajax="$ajax"/>
 				<inp2:m_else />
-					<inp2:m_RenderElement name="grid_search" grid="$grid" PrefixSpecial="$SearchPrefixSpecial"/>
+					<inp2:m_RenderElement name="grid_search" grid="$grid" PrefixSpecial="$SearchPrefixSpecial" ajax="$ajax"/>
 				</inp2:m_if>
 			</inp2:m_if>
 			<td>
@@ -45,18 +45,21 @@
 </table>
 <inp2:m_blockend/>
 
-<inp2:m_DefineElement name="grid_search">
+<inp2:m_DefineElement name="grid_search" ajax="0">
 				<td align="right" style="padding-right: 0px;">
 					<table width="100%" cellspacing="0" cellpadding="0" border="0">
 						<tr>
 							<td><inp2:m_phrase name="la_Search"/>:&nbsp;</td>
-							<td><input type="text"
-									id="<inp2:m_param name="PrefixSpecial"/>_search_keyword"
-									name="<inp2:m_param name="PrefixSpecial"/>_search_keyword"
-									value="<inp2:m_recall var="{$PrefixSpecial}_search_keyword" no_null="no_null" special="1"/>"
-									PrefixSpecial="<inp2:m_param name="PrefixSpecial"/>"
-									Grid="<inp2:m_param name="grid"/>"
-									style="border: 1px solid grey;">
+							<td>
+								<input 	type="text"
+										id="<inp2:m_param name="PrefixSpecial"/>_search_keyword"
+										name="<inp2:m_param name="PrefixSpecial"/>_search_keyword"
+										value="<inp2:m_recall var="{$PrefixSpecial}_search_keyword" no_null="no_null" special="1"/>"
+										PrefixSpecial="<inp2:m_param name="PrefixSpecial"/>"
+										Grid="<inp2:m_param name="grid"/>"
+										ajax="<inp2:m_param name="ajax"/>"
+										style="border: 1px solid grey;">
+								<input type="text" style="display: none"; />
 							</td>
 							<td id="search_buttons[<inp2:m_param name="PrefixSpecial"/>]">
 								<script type="text/javascript">