diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index 2ec599690..10350e2fc 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -4,10 +4,10 @@ tags: $:/tags/EditTemplate
 \define tag-styles()
 background-color:$(backgroundColor)$;
 \end
-<$fieldmangler><div class="tw-edit-tags-list"><$list filter="[is[current]tags[]sort[title]]" storyview="pop" itemClass="tw-tag-editor-label"><$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>
+<div class="tw-edit-tags"><$fieldmangler><$list filter="[is[current]tags[]sort[title]]" storyview="pop" itemClass="tw-tag-editor-label"><$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-add-tag">//Add a new tag:// <span class="tw-add-tag-name"><$edit-text tiddler="$:/NewTagName" tag="input" default="" placeholder="tag name" focusPopup=<<qualify "$:/state/tagsAutoComplete">> class="tw-edit-texteditor"/></span> <$button popup=<<qualify "$:/state/tagsAutoComplete">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button"><$button message="tw-add-tag" param={{$:/NewTagName}} set="$:/NewTagName" setTo="" class="">add</$button></span></div>
+<div class="tw-edit-add-tag"><span class="tw-add-tag-name"><$edit-text tiddler="$:/NewTagName" tag="input" default="" placeholder="tag name" focusPopup=<<qualify "$:/state/tagsAutoComplete">> class="tw-edit-texteditor"/></span> <$button popup=<<qualify "$:/state/tagsAutoComplete">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button"><$button message="tw-add-tag" param={{$:/NewTagName}} set="$:/NewTagName" setTo="" class="">add</$button></span></div>
 
 <div class="tw-block-dropdown-wrapper">
 <$reveal state=<<qualify "$:/state/tagsAutoComplete">> type="nomatch" text="" default="">
@@ -20,3 +20,4 @@ background-color:$(backgroundColor)$;
 </$reveal>
 </div>
 </$fieldmangler>
+</div>
\ No newline at end of file
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 9c386ff4c..234b4af52 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -83,6 +83,16 @@ background-image: -ms-linear-gradient($gradient$);
 	<<box-shadow "inset 0 1px 8px rgba(0, 0, 0, 0.15)">>
 }
 
+.tw-edit-tags {
+	<<box-shadow "inset 0 1px 8px rgba(0, 0, 0, 0.15)">>
+}
+
+.tw-tiddler-frame .tw-edit-tags input.tw-edit-texteditor {
+	<<box-shadow "none">>
+	border: none;
+	outline: none;
+}
+
 canvas.tw-edit-bitmapeditor  {
 	<<box-shadow "2px 2px 5px rgba(0, 0, 0, 0.5)">>
 }
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 67865bdbf..7ebfd5605 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -545,6 +545,23 @@ canvas.tw-edit-bitmapeditor  {
 	font-style: normal;
 }
 
+.tw-edit-tags {
+	border: 1px solid #ddd;
+	padding: 4px 8px 4px 8px;
+}
+
+.tw-edit-add-tag {
+	display: inline-block;
+}
+
+.tw-edit-add-tag .tw-add-tag-name input {
+	width: 50%;
+}
+
+.tw-edit-tags .tw-tag-label {
+	display: inline-block;
+}
+
 .tw-edit-tags-list {
 	margin: 14px 0 14px 0;
 }
@@ -558,11 +575,6 @@ canvas.tw-edit-bitmapeditor  {
 	padding-left: 4px;
 }
 
-.tw-add-tag-name {
-	display: inline-block;
-	width: 15%;
-}
-
 .tw-tiddler-preview {
 	overflow: auto;
 }