diff --git a/tiddlywiki5/shadows/templates/EditTemplate.tid b/tiddlywiki5/shadows/templates/EditTemplate.tid
index 4ae8d7a3d..f4a61a15c 100644
--- a/tiddlywiki5/shadows/templates/EditTemplate.tid
+++ b/tiddlywiki5/shadows/templates/EditTemplate.tid
@@ -4,5 +4,6 @@ modifier: JeremyRuston
 <<view title>> <<command SaveTiddler label:"done" class:"btn btn-mini btn-success">>
 {{title{
 <<edit draft.title>>}}}
+<<edit tags>>
 {{body{
 <<edit text>>}}}
\ No newline at end of file
diff --git a/tiddlywiki5/shadows/templates/ViewTemplate.tid b/tiddlywiki5/shadows/templates/ViewTemplate.tid
index e5be9e5f9..76f4c4730 100644
--- a/tiddlywiki5/shadows/templates/ViewTemplate.tid
+++ b/tiddlywiki5/shadows/templates/ViewTemplate.tid
@@ -4,6 +4,6 @@ modifier: JeremyRuston
 {{title{
 <<view title>>}}}
 {{small{
-<<view modifier link>> <<view modified date>> <<command EditTiddler label:"edit" class:"btn btn-mini btn-primary">>}}}
+<<view modifier link>> <<view modified date>> <<view tags>> <<command EditTiddler label:"edit" class:"btn btn-mini btn-primary">>}}}
 {{body{
 <<view text wikified>>}}}
\ No newline at end of file