diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index 62bec8e6..b0b64041 100644
--- a/adminer/database.inc.php
+++ b/adminer/database.inc.php
@@ -65,7 +65,7 @@ if ($_POST) {
 ) . "\n"; ?>
 <?php echo html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate); ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
-<input type="submit" value="<?php echo lang('Save'); ?>">
+ <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if (!$_POST["add_x"]) {
 	echo "<input type='image' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 9eed7040..9d1bd9f6 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -486,7 +486,7 @@ class Adminer {
 <?php if (isset($_GET["sql"])) { ?><input type="hidden" name="sql" value=""><?php } ?>
 <?php if (isset($_GET["schema"])) { ?><input type="hidden" name="schema" value=""><?php } ?>
 <?php if (isset($_GET["dump"])) { ?><input type="hidden" name="dump" value=""><?php } ?>
-<input type="submit" value="<?php echo lang('Use'); ?>"<?php echo ($databases ? " class='hidden'" : ""); ?>>
+ <input type="submit" value="<?php echo lang('Use'); ?>"<?php echo ($databases ? " class='hidden'" : ""); ?>>
 </p>
 </form>
 <?php
diff --git a/adminer/include/lang.inc.php b/adminer/include/lang.inc.php
index 74f84b69..dbcb4bc2 100644
--- a/adminer/include/lang.inc.php
+++ b/adminer/include/lang.inc.php
@@ -33,7 +33,7 @@ function switch_lang() {
 	echo "<form action=''>\n<div id='lang'>";
 	hidden_fields($_GET, array('lang'));
 	echo lang('Language') . ": " . html_select("lang", $langs, $LANG, "this.form.submit();");
-	echo "<noscript><div style='display: inline;'><input type='submit' value='" . lang('Use') . "'></div></noscript>\n";
+	echo " <input type='submit' value='" . lang('Use') . "' class='hidden'>\n";
 	echo "</div>\n</form>\n";
 }