diff --git a/src/UI/Settings/Metadata/MetadataItemView.js b/src/UI/Settings/Metadata/MetadataItemView.js
index 3fa9f43f4..95f6bdd4a 100644
--- a/src/UI/Settings/Metadata/MetadataItemView.js
+++ b/src/UI/Settings/Metadata/MetadataItemView.js
@@ -13,7 +13,7 @@ define(
             tagName : 'li',
 
             events: {
-                'click .x-edit'  : '_edit'
+                'click'  : '_edit'
             },
 
             initialize: function () {
diff --git a/src/UI/Settings/Metadata/MetadataItemViewTemplate.html b/src/UI/Settings/Metadata/MetadataItemViewTemplate.html
index f461ea4fb..544985ff0 100644
--- a/src/UI/Settings/Metadata/MetadataItemViewTemplate.html
+++ b/src/UI/Settings/Metadata/MetadataItemViewTemplate.html
@@ -1,9 +1,6 @@
-<div class="metadata-item">
+<div class="metadata-item" title="Click to edit">
     <div>
         <h3>{{name}}</h3>
-        <span class="btn-group pull-right">
-            <button class="btn btn-xs btn-icon-only x-edit"><i class="icon-nd-edit"/></button>
-        </span>
     </div>
 
     <div class="settings">
diff --git a/src/UI/Settings/Metadata/metadata.less b/src/UI/Settings/Metadata/metadata.less
index b90674017..566114a39 100644
--- a/src/UI/Settings/Metadata/metadata.less
+++ b/src/UI/Settings/Metadata/metadata.less
@@ -10,6 +10,7 @@
 .metadata-item {
 
   .card;
+  .clickable;
 
   width: 200px;
   height: 230px;
@@ -18,7 +19,7 @@
   h3 {
     margin-top: 0px;
     display: inline-block;
-    width: 140px;
+    width: 180px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;