diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index aa5b36a9..1460906e 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -905,7 +905,8 @@ function is_url($string) {
 */
 function slow_query($query) {
 	global $adminer, $token;
-	if (support("kill") && is_object($connection2 = connect()) && (DB == "" || $connection2->select_db(DB))) {
+	$db = $adminer->database();
+	if (support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
 		$kill = $connection2->result("SELECT CONNECTION_ID()"); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
 		?>
 <script type="text/javascript">
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index c21a1c4e..54a0796a 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -30,6 +30,10 @@ class Adminer {
 		return get_databases($flush);
 	}
 	
+	function queryTimeout() {
+		return 5;
+	}
+	
 	function headers() {
 		return true;
 	}
diff --git a/editor/script.inc.php b/editor/script.inc.php
index e1189ef2..f7b7f644 100644
--- a/editor/script.inc.php
+++ b/editor/script.inc.php
@@ -1,5 +1,8 @@
 <?php
-if (list($table, $id, $name) = $adminer->_foreignColumn(column_foreign_keys($_GET["source"]), $_GET["field"])) {
+if ($_GET["script"] == "kill") {
+	$connection->query("KILL " . (+$_POST["kill"]));
+
+} elseif (list($table, $id, $name) = $adminer->_foreignColumn(column_foreign_keys($_GET["source"]), $_GET["field"])) {
 	$result = $connection->query("SELECT $id, $name FROM " . table($table) . " WHERE " . (ereg('^[0-9]+$', $_GET["value"]) ? "$id = $_GET[value] OR " : "") . "$name LIKE " . q("$_GET[value]%") . " ORDER BY 2 LIMIT 11");
 	for ($i=0; $i < 10 && ($row = $result->fetch_row()); $i++) {
 		echo "<a href='" . h(ME . "edit=" . urlencode($table) . "&where" . urlencode("[" . bracket_escape(idf_unescape($id)) . "]") . "=" . urlencode($row[0])) . "'>" . h($row[1]) . "</a><br>\n";