diff --git a/app/assets/stylesheets/app/_editor.scss b/app/assets/stylesheets/app/_editor.scss
index cd2c35a9a..8b8568a8a 100644
--- a/app/assets/stylesheets/app/_editor.scss
+++ b/app/assets/stylesheets/app/_editor.scss
@@ -78,7 +78,7 @@ $heading-height: 75px;
     color: rgba(black, 0.23);
   }
 
-  .tags {
+  .editor-tags {
     clear: left;
     width: 100%;
     height: 25px;
diff --git a/app/assets/stylesheets/app/_tags.scss b/app/assets/stylesheets/app/_tags.scss
index aecf4dc00..e4b75bb57 100644
--- a/app/assets/stylesheets/app/_tags.scss
+++ b/app/assets/stylesheets/app/_tags.scss
@@ -1,5 +1,4 @@
 .tags {
-    // width: 15%;
     flex: 1 10%;
     max-width: 180px;
     min-width: 100px;
@@ -65,11 +64,20 @@
 
     > .menu {
       font-size: 11px;
-      color: $blue-color;
-      // opacity: 0.5;
+
+      > .item {
+        margin-right: 1px;
+      }
+
+      opacity: 0.5;
+      font-weight: bold;
       clear: both;
       margin-top: 2px;
       margin-bottom: 2px;
+
+      &:hover {
+        opacity: 1.0;
+      }
     }
 
     $tags-selected-color: #dbdbdb;
diff --git a/app/assets/templates/frontend/editor.html.haml b/app/assets/templates/frontend/editor.html.haml
index 933e00c99..c07a82470 100644
--- a/app/assets/templates/frontend/editor.html.haml
+++ b/app/assets/templates/frontend/editor.html.haml
@@ -5,7 +5,7 @@
                 "ng-change" => "ctrl.nameChanged()", "ng-focus" => "ctrl.onNameFocus()",
                 "select-on-click" => "true"}
     .save-status{"ng-class" => "{'red bold': ctrl.saveError}", "ng-bind-html" => "ctrl.noteStatus"}
-    .tags
+    .editor-tags
       %input.tags-input{"type" => "text", "ng-keyup" => "$event.keyCode == 13 && $event.target.blur();",
       "ng-model" => "ctrl.tagsString", "placeholder" => "#tags", "ng-blur" => "ctrl.updateTagsFromTagsString($event, ctrl.tagsString)"}
   .section-menu{"ng-if" => "ctrl.note"}
diff --git a/app/assets/templates/frontend/tags.html.haml b/app/assets/templates/frontend/tags.html.haml
index 496e080aa..89745104f 100644
--- a/app/assets/templates/frontend/tags.html.haml
+++ b/app/assets/templates/frontend/tags.html.haml
@@ -18,6 +18,6 @@
           "spellcheck" => "false"}
           .count {{ctrl.noteCount(tag)}}
         .menu{"ng-if" => "ctrl.selectedTag == tag"}
-          %a{"ng-click" => "ctrl.selectedRenameTag($event, tag)", "ng-if" => "!ctrl.editingTag"} Rename
-          %a{"ng-click" => "ctrl.saveTag($event, tag)", "ng-if" => "ctrl.editingTag"} Save
-          %a{"ng-click" => "ctrl.selectedDeleteTag(tag)"} Delete
+          %a.item{"ng-click" => "ctrl.selectedRenameTag($event, tag)", "ng-if" => "!ctrl.editingTag"} Rename
+          %a.item{"ng-click" => "ctrl.saveTag($event, tag)", "ng-if" => "ctrl.editingTag"} Save
+          %a.item{"ng-click" => "ctrl.selectedDeleteTag(tag)"} Delete