diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid
index 5b351bf1e..fe9f72ddb 100644
--- a/core/ui/EditTemplate.tid
+++ b/core/ui/EditTemplate.tid
@@ -29,10 +29,4 @@ modifier: JeremyRuston
 <$edit field="text"/>
 </$reveal>
 
-<$fieldmangler><div class="tw-edit-fields"><$fieldlist exclude="title tags text modified modifier draft.title draft.of"><div class="tw-edit-field"><span class="tw-edit-field-name"><$info type="currentField"/>:</span> <span class="tw-edit-field-value"><$edit placeholder="field value"/></span> <span class="tw-edit-field-remove"><$button message="tw-remove-field" class="btn-invisible">{{$:/core/images/delete-button}}</$button></span></div>
-</$fieldlist>
-</div>
-
-<div class="tw-edit-field-add">Add a new field: <span class="tw-edit-field-add-name"><$edit tiddler="$:/NewFieldName" type="input" default="" placeholder="field name"/></span> <span class="tw-edit-field-add-button"><$button message="tw-add-field" param={{$:/NewFieldName}} set="$:/NewFieldName" setTo="" class="">add</$button></span></div>
-
-</$fieldmangler>
+{{$:/core/ui/FieldEditor}}
diff --git a/core/ui/FieldEditor.tid b/core/ui/FieldEditor.tid
new file mode 100644
index 000000000..fbd9b293f
--- /dev/null
+++ b/core/ui/FieldEditor.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/FieldEditor
+
+<$fieldmangler><div class="tw-edit-fields"><$fieldlist exclude="title tags text modified modifier draft.title draft.of"><div class="tw-edit-field"><span class="tw-edit-field-name"><$info type="currentField"/>:</span> <span class="tw-edit-field-value"><$edit placeholder="field value"/></span> <span class="tw-edit-field-remove"><$button message="tw-remove-field" class="btn-invisible">{{$:/core/images/delete-button}}</$button></span></div>
+</$fieldlist>
+</div>
+
+<div class="tw-edit-field-add">Add a new field: <span class="tw-edit-field-add-name"><$edit tiddler="$:/NewFieldName" type="input" default="" placeholder="field name"/></span> <span class="tw-edit-field-add-button"><$button message="tw-add-field" param={{$:/NewFieldName}} set="$:/NewFieldName" setTo="" class="">add</$button></span></div>
+
+</$fieldmangler>