diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 61437d81..7575b2a7 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -105,7 +105,7 @@ function adminer_row_descriptions($rows, $foreign_keys) {
 * @return string
 */
 function adminer_select_val($val, $link) {
-	return call_adminer('select_val', ($link ? '<a href="' . $link . '">' . $val . '</a>' : $val), $val, $link);
+	return call_adminer('select_val', ($link ? "<a href=\"$link\">$val</a>" : $val), $val, $link);
 }
 
 /** Query printed after execution in the message
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 9e32d745..788adb29 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -101,7 +101,10 @@ function adminer_row_descriptions($rows, $foreign_keys) {
 }
 
 function adminer_select_val($val, $link) {
-	return call_adminer('select_val', ($link ? "<a href=\"$link\">$val</a>" : ($val == "<i>NULL</i>" ? "" : $val)), $val, $link);
+	return call_adminer('select_val', ($link ?
+		"<a href=\"$link\">$val</a>" :
+		($val == "<i>NULL</i>" ? "" : preg_replace('~^<code>(.*)</code>$~', '\\1', $val))
+	), $val, $link);
 }
 
 function adminer_message_query($query) {