diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
index 96f83de0c..2a4e21a58 100644
--- a/core/ui/EditTemplate/fields.tid
+++ b/core/ui/EditTemplate/fields.tid
@@ -33,10 +33,18 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 <div class="tc-edit-field-add">
 <em class="tc-edit">
 <<lingo Fields/Add/Prompt>>
-</em> <span class="tc-edit-field-add-name">
+</em>
+<span class="tc-edit-field-add-name">
 <$edit-text tiddler="$:/temp/newfieldname" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tc-edit-texteditor"/>
-</span> <span class="tc-edit-field-add-button">
-<$button message="tm-add-field" param={{$:/temp/newfieldname}} set="$:/temp/newfieldname" setTo="" class="">
+</span>
+<span class="tc-edit-field-add-value">
+<$edit-text tiddler="$:/temp/newfieldvalue" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} class="tc-edit-texteditor"/>
+</span>
+<span class="tc-edit-field-add-button">
+<$button>
+<$action-setfield $field={{$:/temp/newfieldname}} $value={{$:/temp/newfieldvalue}}/>
+<$action-deletetiddler $tiddler="$:/temp/newfieldname"/>
+<$action-deletetiddler $tiddler="$:/temp/newfieldvalue"/>
 <<lingo Fields/Add/Button>>
 </$button>
 </span>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 0aa56eadc..c0fa69721 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -856,6 +856,11 @@ canvas.tc-edit-bitmapeditor  {
 	width: 15%;
 }
 
+.tc-edit-field-add-value {
+	display: inline-block;
+	width: 40%;
+}
+
 .tc-edit-field-add-button {
 	display: inline-block;
 	width: 10%;