diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 50b50c851..7baf043d2 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -39,6 +39,7 @@ iD.ui.Inspector = function() {
 
         tagEditor = iD.ui.TagEditor()
             .presetData(presetData)
+            .tags(entity.tags)
             .context(context)
             .on('message', changeMessage)
             .on('choose', function() {
diff --git a/js/id/ui/tageditor.js b/js/id/ui/tageditor.js
index 81b5a9234..19b3e907b 100644
--- a/js/id/ui/tageditor.js
+++ b/js/id/ui/tageditor.js
@@ -4,6 +4,7 @@ iD.ui.TagEditor = function() {
         presetData = iD.presetData(),
         inspectorbody,
         entity,
+        tags,
         presetMatch,
         presetUI,
         presetGrid,
@@ -13,6 +14,11 @@ iD.ui.TagEditor = function() {
     function tageditor(selection, tagview, preset) {
 
         entity = selection.datum();
+
+        if (preset) {
+            tags = _.omit(tags, _.keys(presetMatch.match.tags));
+        }
+
         presetMatch = preset || presetData.matchTags(entity);
 
         selection.html('');
@@ -97,7 +103,7 @@ iD.ui.TagEditor = function() {
 
         var taglistwrap = editorwrap.append('div').call(tagList);
 
-        tageditor.tags(entity.tags);
+        tageditor.tags(tags);
     }
 
     function drawHead(selection) {
@@ -112,12 +118,16 @@ iD.ui.TagEditor = function() {
             .text(entity.friendlyName());
     }
 
-    tageditor.tags = function(tags) {
+    tageditor.tags = function(newtags) {
         if (!arguments.length) {
             return _.extend(presetUI.tags(), tagList.tags());
         } else {
-            presetUI.change(tags);
-            tagList.tags(_.omit(tags, _.keys(presetUI.tags() || {})));
+            tags = newtags;
+            if (presetUI && tagList) {
+                presetUI.change(tags);
+                tagList.tags(_.omit(tags, _.keys(presetUI.tags() || {})));
+            }
+            return tageditor;
         }
     };