diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid
index 794e61577..5c2518991 100644
--- a/core/ui/EditTemplate/type.tid
+++ b/core/ui/EditTemplate/type.tid
@@ -2,15 +2,12 @@ title: $:/core/ui/EditTemplate/type
 tags: $:/tags/EditTemplate
 
 \define lingo-base() $:/language/EditTemplate/
-<p><$fieldmangler><em class="tw-edit"><<lingo Type/Prompt>></em> <$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/typeDropdown">> class="tw-edit-typeeditor"/> <$button popup=<<qualify "$:/state/typeDropdown">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <$button message="tw-remove-field" param="type" class="btn-invisible btn-icon">{{$:/core/images/delete-button}}</$button></$fieldmangler></p>
-
-<div class="tw-block-dropdown-wrapper">
-<$reveal state=<<qualify "$:/state/typeDropdown">> type="nomatch" text="" default="">
-<div class="tw-block-dropdown tw-edit-type-dropdown">
-<$linkcatcher to="!!type">
-<$list filter="[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]] +[sort[description]]"><$link to={{!!name}}><$view field="description"/> (<$view field="name"/>)</$link>
+<<lingo Type/Prompt>> <$select field="type" default="text/vnd.tiddlywiki">
+<$list filter="[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]each[group]]">
+<optgroup label={{!!group}}>
+<$list filter="[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]group{!!group}] +[sort[description]]">
+<option value={{!!name}}><$view field="description"><$view field="title"/></$view> (<$view field="name"/>)</option>
 </$list>
-</$linkcatcher>
-</div>
-</$reveal>
-</div>
\ No newline at end of file
+</optgroup>
+</$list>
+</$select>