diff --git a/boot/boot.js b/boot/boot.js
index 954071c2f..119f4192b 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -700,6 +700,7 @@ $tw.modules.define("$:/boot/tiddlerfields/created","tiddlerfield",{
 });
 $tw.modules.define("$:/boot/tiddlerfields/color","tiddlerfield",{
 	name: "color",
+	editTag: "input",
 	editType: "color"
 });
 $tw.modules.define("$:/boot/tiddlerfields/tags","tiddlerfield",{
diff --git a/core/modules/new_widgets/edit-text.js b/core/modules/new_widgets/edit-text.js
index 6b2c10a26..b79406f2d 100644
--- a/core/modules/new_widgets/edit-text.js
+++ b/core/modules/new_widgets/edit-text.js
@@ -122,6 +122,9 @@ EditTextWidget.prototype.execute = function() {
 	} else {
 		tag = "input";
 		var fieldModule = $tw.Tiddler.fieldModules[this.editField];
+		if(fieldModule && fieldModule.editTag) {
+			tag = fieldModule.editTag;
+		}
 		if(fieldModule && fieldModule.editType) {
 			type = fieldModule.editType;
 		}