diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 5bc0c684..633fab65 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -35,7 +35,7 @@ function adminer_table_name($row) {
 * @return string
 */
 function adminer_field_name($fields, $key) {
-	return call_adminer('field_name', htmlspecialchars($key), $fields, $key);
+	return call_adminer('field_name', '<span title="' . htmlspecialchars($fields[$key]["full_type"]) . '">' . htmlspecialchars($key) . '</span>', $fields, $key);
 }
 
 /** Links after select heading
diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 52427d2c..cd86f32a 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -13,7 +13,7 @@ $columns = array(); // selectable columns
 unset($text_length);
 foreach ($fields as $key => $field) {
 	if (isset($field["privileges"]["select"])) {
-		$columns[$key] = adminer_field_name($fields, $key); //! numeric $key is problematic in optionlist()
+		$columns[$key] = strip_tags(adminer_field_name($fields, $key)); //! numeric $key is problematic in optionlist()
 		if (preg_match('~text|blob~', $field["type"])) {
 			$text_length = (isset($_GET["text_length"]) ? $_GET["text_length"] : "100");
 		}