diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
index a3661c2d6..b537389ba 100644
--- a/core/ui/EditTemplate/fields.tid
+++ b/core/ui/EditTemplate/fields.tid
@@ -2,14 +2,36 @@ title: $:/core/ui/EditTemplate/fields
 tags: $:/tags/EditTemplate
 
 \define lingo-base() $:/language/EditTemplate/
-<$fieldmangler><div class="tw-edit-fields">
-<table class="tw-edit-fields"><tbody><$list filter="[all[current]fields[]] -title -tags -text -creator -created -modified -modifier -type -[[draft.title]] -[[draft.of]]" variable="currentField"><tr class="tw-edit-field"><td class="tw-edit-field-name"><<currentField>>:</td><td class="tw-edit-field-value"><$edit-text tiddler=<<currentTiddler>> field=<<currentField>> placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}}/></td><td class="tw-edit-field-remove"><$button message="tw-remove-field" param=<<currentField>> class="btn-invisible">{{$:/core/images/delete-button}}</$button></td>
+<$fieldmangler>
+<div class="tw-edit-fields">
+<table class="tw-edit-fields">
+<tbody>
+<$list filter="[all[current]fields[]] -title -tags -text -creator -created -modified -modifier -type -[[draft.title]] -[[draft.of]]" variable="currentField">
+<tr class="tw-edit-field">
+<td class="tw-edit-field-name">
+<$text text=<<currentField>>/>:</td>
+<td class="tw-edit-field-value">
+<$edit-text tiddler=<<currentTiddler>> field=<<currentField>> placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}}/>
+</td>
+<td class="tw-edit-field-remove">
+<$button message="tw-remove-field" param=<<currentField>> class="btn-invisible">{{$:/core/images/delete-button}}</$button>
+</td>
 </tr>
 </$list>
 </tbody>
 </table>
 </div>
 
-<div class="tw-edit-field-add"><em class="tw-edit"><<lingo Fields/Add/Prompt>></em> <span class="tw-edit-field-add-name"><$edit-text tiddler="$:/temp/NewFieldName" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tw-edit-texteditor"/></span> <span class="tw-edit-field-add-button"><$button message="tw-add-field" param={{$:/temp/NewFieldName}} set="$:/temp/NewFieldName" setTo="" class=""><<lingo Fields/Add/Button>></$button></span></div>
+<div class="tw-edit-field-add">
+<em class="tw-edit">
+<<lingo Fields/Add/Prompt>>
+</em> <span class="tw-edit-field-add-name">
+<$edit-text tiddler="$:/temp/NewFieldName" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tw-edit-texteditor"/>
+</span> <span class="tw-edit-field-add-button">
+<$button message="tw-add-field" param={{$:/temp/NewFieldName}} set="$:/temp/NewFieldName" setTo="" class="">
+<<lingo Fields/Add/Button>>
+</$button>
+</span>
+</div>
 
 </$fieldmangler>
diff --git a/core/ui/TiddlerFieldTemplate.tid b/core/ui/TiddlerFieldTemplate.tid
index 0a990810a..048c9b8fb 100644
--- a/core/ui/TiddlerFieldTemplate.tid
+++ b/core/ui/TiddlerFieldTemplate.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/TiddlerFieldTemplate
 
 <tr class="tw-view-field">
 <td class="tw-view-field-name">
-<<listItem>>
+<$text text=<<listItem>>/>
 </td>
 <td class="tw-view-field-value">
 <$view field=<<listItem>>/>