diff --git a/core/language/en-GB/EditTemplate.multids b/core/language/en-GB/EditTemplate.multids
index 68929ed2c..b864e7896 100644
--- a/core/language/en-GB/EditTemplate.multids
+++ b/core/language/en-GB/EditTemplate.multids
@@ -11,6 +11,8 @@ Fields/Add/Button: add
 Fields/Add/Name/Placeholder: field name
 Fields/Add/Prompt: Add a new field:
 Fields/Add/Value/Placeholder: field value
+Fields/Add/Dropdown/System: System fields
+Fields/Add/Dropdown/User: User fields
 Shadow/Warning: This is a shadow tiddler. Any changes will override the default version
 Shadow/OverriddenWarning: This is a modified shadow tiddler. You can revert to the default version by deleting this tiddler
 Tags/Add/Button: add
diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
index 76e2dd4ca..fbd02e9ce 100644
--- a/core/ui/EditTemplate/fields.tid
+++ b/core/ui/EditTemplate/fields.tid
@@ -71,19 +71,21 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 <div class="tc-block-dropdown tc-edit-type-dropdown">
 <$linkcatcher to="$:/temp/newfieldname">
 <div class="tc-dropdown-item">
-Personal<br>
+<<lingo Fields/Add/Dropdown/User>>
+</div>
 <$list filter="[!is[shadow]!is[system]fields[]sort[]] -created -creator -draft.of -draft.title -modified -modifier -tags -text -title -type"  variable="currentField">
 <$link to=<<currentField>>>
 <<currentField>>
 </$link>
 </$list>
-System<br>
+<div class="tc-dropdown-item">
+<<lingo Fields/Add/Dropdown/System>>
+</div>
 <$list filter="[fields[]sort[]] -[!is[shadow]!is[system]fields[]]" variable="currentField">
 <$link to=<<currentField>>>
 <<currentField>>
 </$link>
 </$list>
-</div>
 </$linkcatcher>
 </div>
 </$reveal>
diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid
index f24c0ba86..535f6c8f1 100644
--- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid	
@@ -115,10 +115,11 @@ and "open new window" <span title="$:/core/images/open-window">{{$:/core/images/
 * [[Avoid|https://github.com/Jermolene/TiddlyWiki5/commit/7b4153f87f8b4793fa055ec287a659ece3150d99]] glitch with autofocusing the search box in the plugin library
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/9f92c086c31a528a2ffb6bc9fed53d4cc016480f]] information about TiddlyDesktop to [[Releases]]
 * [[Stopped|https://github.com/Jermolene/TiddlyWiki5/commit/4a3a5bf1f06c4efb8449c860e90c214f707954f6]] autosaving after cancelling an edit
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/]] dropdown to edit template to allow existing field names to be selected
 
 !! Hackability Improvements
 
-* [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/]] to ~KaTeX version 0.4.3, with the following editions since the previous 0.2.0 release that was distributed with TiddlyWiki 5.1.8:
+* [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/5f3587c38c2968ff63780552ef50b52d87ada3ca]] to ~KaTeX version 0.4.3, with the following editions since the previous 0.2.0 release that was distributed with TiddlyWiki 5.1.8:
 ** Added support for some `\begin`/`\end` environments, including support for `array`, `matrix`, `pmatrix`, `bmatrix`, `vmatrix`, and `Vmatrix`
 ** Added support for optional `\sqrt` arguments, e.g. `\sqrt[3]{x}`
 ** Add support for `\phantom`