diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index bc67f4a4..504f475b 100644
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -48,8 +48,6 @@ if ($_GET["ns"] !== "") {
 		echo "<form action='' method='post'>\n";
 		echo "<p>" . lang('Search data in tables') . ": <input name='query' value='" . h($_POST["query"]) . "'> <input type='submit' name='search' value='" . lang('Search') . "'>\n";
 		if ($_POST["search"] && $_POST["query"] != "") {
-			$_GET["where"][0]["op"] = "LIKE %%";
-			$_GET["where"][0]["val"] = $_POST["query"];
 			search_tables();
 		}
 		echo "<table cellspacing='0' class='nowrap' onclick='tableClick(event);'>\n";
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index e994e66f..18131962 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -632,6 +632,8 @@ function process_input($field) {
 */
 function search_tables() {
 	global $adminer, $connection;
+	$_GET["where"][0]["op"] = "LIKE %%";
+	$_GET["where"][0]["val"] = $_POST["query"];
 	$found = false;
 	foreach (table_status() as $table => $table_status) {
 		$name = $adminer->tableName($table_status);
diff --git a/editor/db.inc.php b/editor/db.inc.php
index 834cbf6f..ba887864 100644
--- a/editor/db.inc.php
+++ b/editor/db.inc.php
@@ -1,14 +1,21 @@
 <?php
 page_header(lang('Server'), "", false);
 
-?>
-<form action=""><p>
-<?php echo lang('Search data in tables'); ?>:
-<?php hidden_fields_get(); ?>
-<input name="where[0][val]" value="<?php echo h($_GET["where"][0]["val"]); ?>">
-<input type="submit" value="<?php echo lang('Search'); ?>" />
-</form>
-<?php
-if ($_GET["where"][0]["val"] != "") {
+echo "<form action='' method='post'>\n";
+echo "<p>" . lang('Search data in tables') . ": <input name='query' value='" . h($_POST["query"]) . "'> <input type='submit' value='" . lang('Search') . "'>\n";
+if ($_POST["query"] != "") {
 	search_tables();
 }
+echo "<table cellspacing='0' class='nowrap' onclick='tableClick(event);'>\n";
+echo '<thead><tr class="wrap"><td><input id="check-all" type="checkbox" onclick="formCheck(this, /^tables\[/);"><th>' . lang('Table') . '<td>' . lang('Rows') . "</thead>\n";
+foreach (table_status() as $table => $row) {
+	$name = $adminer->tableName($row);
+	if (isset($row["Engine"]) && $name != "") {
+		echo '<tr' . odd() . '><td>' . checkbox("tables[]", $table, in_array($table, (array) $_POST["tables"], true), "", "formUncheck('check-all');");
+		echo '<th><a href="' . h(ME) . 'select=' . urlencode($table) . '">' . h($name) . '</a>';
+		$val = number_format($row["Rows"], 0, '.', lang(','));
+		echo "<td align='right'><a href='" . h(ME . "edit=") . urlencode($table) . "'>" . ($row["Engine"] == "InnoDB" && $val ? "~ $val" : $val) . "</a>";
+	}
+}
+echo "</table>\n";
+echo "</form>\n";