diff --git a/js/id/services/taginfo.js b/js/id/services/taginfo.js
index b71661d25..4bd7c8750 100644
--- a/js/id/services/taginfo.js
+++ b/js/id/services/taginfo.js
@@ -44,12 +44,17 @@ iD.services.taginfo = function() {
         return function(d) { return parseFloat(d.fraction) > 0.01 || d.in_wiki; };
     }
 
-    function valKey(d) { return { value: d.key }; }
+    function valKey(d) {
+        return {
+            value: d.key,
+            title: d.key
+        };
+    }
 
     function valKeyDescription(d) {
         return {
             value: d.value,
-            title: d.description
+            title: d.description || d.value
         };
     }
 
diff --git a/js/id/ui/raw_tag_editor.js b/js/id/ui/raw_tag_editor.js
index 8b601303a..87ff0ebf2 100644
--- a/js/id/ui/raw_tag_editor.js
+++ b/js/id/ui/raw_tag_editor.js
@@ -100,11 +100,13 @@ iD.ui.RawTagEditor = function(context) {
         });
 
         $items.select('input.key')
+            .attr('title', function(d) { return d.key; })
             .value(function(d) { return d.key; })
             .on('blur', keyChange)
             .on('change', keyChange);
 
         $items.select('input.value')
+            .attr('title', function(d) { return d.value; })
             .value(function(d) { return d.value; })
             .on('blur', valueChange)
             .on('change', valueChange)