diff --git a/core/styles/base.tid b/core/styles/base.tid
index 120ab63d0..3ba02c199 100644
--- a/core/styles/base.tid
+++ b/core/styles/base.tid
@@ -80,6 +80,10 @@ a.tw-tiddlylink-missing {
 	border: none;
 }
 
+.tw-tags-wrapper {
+	margin: 0.25em 0 1em 0;
+}
+
 .tw-tag-label {
 	display: inline-block;
 	padding: 2px 4px;
@@ -91,11 +95,15 @@ a.tw-tiddlylink-missing {
 	white-space: nowrap;
 	vertical-align: baseline;
 	background-color: #999999;
-	border: 1px solid rgba(0,0,0,0.22);
+	border: 1px solid rgba(0,0,0,0.0);
 	<<border-radius 3px>>
 	<<box-shadow "inset 1px 1px 0 rgba(255,255,255,0.22)">>
 }
 
+.tw-tag-label:hover {
+	<<box-shadow "inset 0px 2em 0 rgba(0,0,0,0.22)">>
+}
+
 .edit-header {
 }
 
@@ -167,6 +175,12 @@ a.tw-tiddlylink-missing {
 	padding: 0em 1em 0em 1em;
 }
 
+.tw-drop-down a:hover {
+	color: {{$:/core/styles/colourmappings##linkbackground}};
+	background-color: {{$:/core/styles/colourmappings##linkforeground}};
+	text-decoration: none;
+}
+
 .tw-edit-texteditor input, .tw-edit-texteditor textarea {
 	width: 100%;
 }
diff --git a/core/templates/ViewTemplate.tid b/core/templates/ViewTemplate.tid
index e671679f6..d6a2c5b36 100644
--- a/core/templates/ViewTemplate.tid
+++ b/core/templates/ViewTemplate.tid
@@ -11,7 +11,7 @@ modifier: JeremyRuston
 
 <div class="small"><$view field="modifier" format="link"/> <$view field="modified" format="date"/></div>
 
-@@.tw-tags-wrapper <$list filter="[is[current]tags[]]" template="$:/templates/TagTemplate" />@@
+<div class="tw-tags-wrapper"><$list filter="[is[current]tags[]]" template="$:/templates/TagTemplate" /></div>
 
 <div class="body">
 	<$view field="text" format="wikified">