diff --git a/db_search.php b/db_search.php
index 627ac2567..ebc5d66b2 100755
--- a/db_search.php
+++ b/db_search.php
@@ -55,6 +55,9 @@
  */
 require_once './libraries/common.inc.php';
 
+$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2.js';
+$GLOBALS['js_include'][] = 'db_search.js';
+
 /**
  * Gets some core libraries and send headers
  */
@@ -129,8 +132,11 @@ if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) {
  * Displays top links
  */
 $sub_part = '';
-require './libraries/db_info.inc.php';
 
+if( $GLOBALS['is_ajax_request'] != true) {
+    require './libraries/db_info.inc.php';
+    echo '<div id="searchresults">';
+}
 
 /**
  * 1. Main search form has been submitted
@@ -287,13 +293,19 @@ if (isset($_REQUEST['submit_search'])) {
     }
 } // end 1.
 
+if($GLOBALS['is_ajax_request'] == true) {
+    exit;
+}
+else {
+    echo '</div>';//end searchresults div
+}
 
 /**
  * 2. Displays the main search form
  */
 ?>
 <a name="db_search"></a>
-<form method="post" action="db_search.php" name="db_search">
+<form id="db_search_form" method="post" action="db_search.php" name="db_search">
 <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db']); ?>
 <fieldset>
     <legend><?php echo __('Search in database'); ?></legend>