diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 92f399bb..93195b99 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -404,7 +404,12 @@ class Adminer {
 	* @return string custom input field or empty string for default
 	*/
 	function editInput($table, $field, $attrs, $value) {
-		return '';
+		if ($field["type"] == "enum") {
+			return ($field["null"] ? "<label><input type='radio'$attrs value=''" . (isset($value) || isset($_GET["select"]) ? "" : " checked") . "><em>NULL</em></label> " : "")
+				. "<input type='radio'$attrs value='0'" . ($value === 0 ? " checked" : "") . ">"
+			;
+		}
+		return "";
 	}
 	
 	/** Process sent input
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index fcfaa8fa..60f57800 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -417,11 +417,8 @@ function input($field, $value, $function) {
 	echo "<td class='function'>";
 	$functions = (isset($_GET["select"]) ? array("orig" => lang('original')) : array()) + $adminer->editFunctions($field);
 	if ($field["type"] == "enum") {
-		echo "&nbsp;<td>" . ($functions["orig"] ? "<label><input type='radio' name='fields[$name]' value='-1' checked><em>$functions[orig]</em></label> " : "");
-		if (in_array("NULL", $functions)) {
-			echo "<label><input type='radio' name='fields[$name]' value=''" . (isset($value) || $functions["orig"] ? '' : ' checked') . "><em>NULL</em></label> ";
-		}
-		echo "<input type='radio' name='fields[$name]' value='0'" . ($value === 0 ? ' checked' : '') . '>';
+		echo nbsp($functions[""]) . "<td>" . ($functions["orig"] ? "<label><input type='radio' name='fields[$name]' value='-1' checked><em>$functions[orig]</em></label> " : "");
+		echo $adminer->editInput($_GET["edit"], $field, " name='fields[$name]'", $value);
 		preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
 		foreach ($matches[1] as $i => $val) {
 			$val = stripcslashes(str_replace("''", "'", $val));
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 24b3cd01..19b18186 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -394,6 +394,9 @@ ORDER BY ORDINAL_POSITION");
 	
 	function editInput($table, $field, $attrs, $value) {
 		global $connection;
+		if ($field["type"] == "enum") {
+			return ($field["null"] ? "<input type='radio'$attrs value=''" . ($value || isset($_GET["select"]) ? "" : " checked") . ">" : "");
+		}
 		$foreignKeys = column_foreign_keys($table);
 		foreach ((array) $foreignKeys[$field["field"]] as $foreignKey) {
 			if (count($foreignKey["source"]) == 1) {