diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index b9bb39cb..804f5958 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -398,7 +398,7 @@ document.getElementById('username').focus();
 			? ereg_replace('[\x80-\xFF]+$', '', substr($query, 0, 1e6)) . "\n..." // [\x80-\xFF] - valid UTF-8, \n - can end by one-line comment
 			: $query
 		); //! respect $_GET["ns"]
-		return " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><div id='$id' class='hidden'><pre class='jush-$jush'>" . shorten_utf8($query, 1000) . '</pre><p><a href="' . h(str_replace("db=" . urlencode(DB), "db=" . urlencode($_GET["db"]), ME) . 'sql=&history=' . (count($history[$_GET["db"]]) - 1)) . '">' . lang('Edit') . '</a></div>';
+		return " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><div id='$id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . '</code></pre><p><a href="' . h(str_replace("db=" . urlencode(DB), "db=" . urlencode($_GET["db"]), ME) . 'sql=&history=' . (count($history[$_GET["db"]]) - 1)) . '">' . lang('Edit') . '</a></div>';
 	}
 	
 	/** Functions displayed in edit form
diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index c4f74574..26641567 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -59,7 +59,7 @@ if (!$error && $_POST) {
 						$empty = false;
 						$q = substr($query, 0, $match[0][1]);
 						$commands++;
-						echo "<pre class='jush-$jush' id='sql-$commands'>" . shorten_utf8(trim($q), 1000) . "</pre>\n";
+						echo "<pre id='sql-$commands'><code class='jush-$jush'>" . shorten_utf8(trim($q), 1000) . "</code></pre>\n";
 						ob_flush();
 						flush(); // can take a long time - show the running query
 						$start = explode(" ", microtime()); // microtime(true) is available since PHP 5
diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index 95e452f5..4ac8f493 100644
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -22,8 +22,7 @@ function bodyLoad(version, protocol) {
 			if (window.jushLinks) {
 				jush.custom_links = jushLinks;
 			}
-			jush.highlight_tag('pre', 0);
-			jush.highlight_tag('code');
+			jush.highlight_tag('code', 0);
 		}
 	};
 	script.onreadystatechange = function () {
diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index dd161f23..97c2b354 100644
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -223,8 +223,7 @@ function ajaxSend(url, data) {
 			clearTimeout(ajaxTimeout);
 			setHtml('main', text);
 			if (window.jush) {
-				jush.highlight_tag('code');
-				jush.highlight_tag('pre', 0);
+				jush.highlight_tag('code', 0);
 			}
 		}
 	}, data);