diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index 365678cc3..e8a68c4b4 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -7,7 +7,11 @@ background-color:$(backgroundColor)$;
 \end
 <div class="tw-edit-tags">
 <$fieldmangler>
-<$list filter="[all[current]tags[]sort[title]]" storyview="pop" template="$:/core/ui/TagEditTemplate"/>
+<$list filter="[all[current]tags[]sort[title]]" storyview="pop"><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label">
+<$view field="title" format="text" />
+<$button message="tw-remove-tag" param={{!!title}} class="btn-invisible tw-remove-tag-button">&times;</$button></span>
+</$set>
+</$list>
 
 <div class="tw-edit-add-tag">
 <span class="tw-add-tag-name">
diff --git a/core/ui/TagEditTemplate.tid b/core/ui/TagEditTemplate.tid
deleted file mode 100644
index 81335a65b..000000000
--- a/core/ui/TagEditTemplate.tid
+++ /dev/null
@@ -1,16 +0,0 @@
-title: $:/core/ui/TagEditTemplate
-
-\define tag-styles()
-background-color:$(backgroundColor)$;
-\end
-<$set name="backgroundColor" value={{!!color}}>
-<$button popup=<<qualify "$:/state/tagpopup">> class="btn-invisible tw-tag-label" style=<<tag-styles>>>
-<$view field="title" format="text" />
-<$button message="tw-remove-tag" param={{!!title}} class="btn-invisible tw-remove-tag-button">&times;</$button>
-</$button>
-</$set>
-<$reveal state=<<qualify "$:/state/tagpopup">> type="popup" position="below" animate="yes"><div class="tw-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/>
-<hr>
-<$list filter="[all[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/>
-</div>
-</$reveal>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/Release 5.0.9beta.tid b/editions/tw5.com/tiddlers/Release 5.0.9beta.tid
index e00e1e0af..50aa2494d 100644
--- a/editions/tw5.com/tiddlers/Release 5.0.9beta.tid	
+++ b/editions/tw5.com/tiddlers/Release 5.0.9beta.tid	
@@ -25,7 +25,6 @@ type: text/vnd.tiddlywiki
 
 * Made the dropdown arrow icon [[skinnier|https://github.com/Jermolene/TiddlyWiki5/commit/ec90ac99cf2767b6ff20902d8b01aa1c36778147]]
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/bca1d552803c1839e7385765314f81c5307632b8]] validation of legal characters for fieldnames
-* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/45a362c2859ed401a0af5ca3bbbc976710bf4acf]] a dropdown for tags in edit mode
 * Added blacklisting of unsage HTML [[elements|https://github.com/Jermolene/TiddlyWiki5/commit/ba6edd42c125cb19d955a1cb3f54a2d367cb79dc]] and [[attributes|https://github.com/Jermolene/TiddlyWiki5/commit/ba6edd42c125cb19d955a1cb3f54a2d367cb79dc]]
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/baa8cf3dd098bab0a7a8c78b24747c69bd40889f]] a warning indicator to tiddlers in TiddlyWikiClassic format
 * [[Add|https://github.com/Jermolene/TiddlyWiki5/commit/42c67cfeb732fccb10b8ab574c84090dc2471352]] tiddler info ''Advanced'' panel with information about plugins and shadow tiddlers