diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 266d7d08..a91b764a 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -812,17 +812,16 @@ username.form['auth[driver]'].onchange();
 <form action="">
 <p id="dbs">
 <?php
-hidden_fields_get();
-echo ($databases
-	? '<select name="db" onmousedown="dbMouseDown(event, this);" onchange="dbChange(this);">' . optionlist(array("" => "(" . lang('database') . ")") + $databases, DB) . '</select>'
-	: '<input name="db" value="' . h(DB) . '" autocapitalize="off">'
-);
-?>
-<input type="submit" value="<?php echo lang('Use'); ?>"<?php echo ($databases ? " class='hidden'" : ""); ?>>
-<?php
+		hidden_fields_get();
+		$db_events = " onmousedown='dbMouseDown(event, this);' onchange='dbChange(this);'";
+		echo ($databases
+			? "<select name='db'$db_events>" . optionlist(array("" => "(" . lang('database') . ")") + $databases, DB) . "</select>"
+			: '<input name="db" value="' . h(DB) . '" autocapitalize="off">'
+		);
+		echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
 		if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
 			if (support("scheme")) {
-				echo "<br>" . html_select("ns", array("" => "(" . lang('schema') . ")") + schemas(), $_GET["ns"], "this.form.submit();");
+				echo "<br><select name='ns'$db_events>" . optionlist(array("" => "(" . lang('schema') . ")") + schemas(), $_GET["ns"]) . "</select>";
 				if ($_GET["ns"] != "") {
 					set_schema($_GET["ns"]);
 				}
diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index 316a177f..fafc8cc9 100644
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -76,7 +76,7 @@ function loginDriver(driver) {
 
 
 var dbCtrl;
-var dbPrevious;
+var dbPrevious = {};
 
 /** Check if database should be opened to a new window
 * @param MouseEvent
@@ -84,8 +84,8 @@ var dbPrevious;
 */
 function dbMouseDown(event, el) {
 	dbCtrl = isCtrl(event);
-	if (dbPrevious == undefined) {
-		dbPrevious = el.value;
+	if (dbPrevious[el.name] == undefined) {
+		dbPrevious[el.name] = el.value;
 	}
 }
 
@@ -98,9 +98,9 @@ function dbChange(el) {
 	}
 	el.form.submit();
 	el.form.target = '';
-	if (dbCtrl && dbPrevious != undefined) {
-		el.value = dbPrevious;
-		dbPrevious = undefined;
+	if (dbCtrl && dbPrevious[el.name] != undefined) {
+		el.value = dbPrevious[el.name];
+		dbPrevious[el.name] = undefined;
 	}
 }