diff --git a/js/id/ui/entity_editor.js b/js/id/ui/entity_editor.js
index 2d076ca91..91e53344e 100644
--- a/js/id/ui/entity_editor.js
+++ b/js/id/ui/entity_editor.js
@@ -4,6 +4,9 @@ iD.ui.EntityEditor = function(context) {
         id,
         preset;
 
+    var rawTagEditor = iD.ui.RawTagEditor(context)
+        .on('change', changeTags);
+
     function entityEditor(selection) {
         var entity = context.entity(id),
             tags = _.clone(entity.tags);
@@ -88,11 +91,10 @@ iD.ui.EntityEditor = function(context) {
                 .on('change', changeTags));
 
         $body.select('.raw-tag-editor')
-            .call(iD.ui.RawTagEditor(context)
+            .call(rawTagEditor
                 .preset(preset)
                 .entityID(id)
-                .tags(tags)
-                .on('change', changeTags));
+                .tags(tags));
 
         if (entity.type === 'relation') {
             $body.select('.raw-member-editor')
diff --git a/js/id/ui/raw_tag_editor.js b/js/id/ui/raw_tag_editor.js
index 9b854d338..ad557ee97 100644
--- a/js/id/ui/raw_tag_editor.js
+++ b/js/id/ui/raw_tag_editor.js
@@ -1,6 +1,7 @@
 iD.ui.RawTagEditor = function(context) {
     var event = d3.dispatch('change'),
         taginfo = iD.taginfo(),
+        showBlank = false,
         preset,
         tags,
         id;
@@ -25,8 +26,9 @@ iD.ui.RawTagEditor = function(context) {
     function content($wrap) {
         var entries = d3.entries(tags);
 
-        if (!entries.length) {
-            entries = [{key: '', value: ''}];
+        if (!entries.length || showBlank) {
+            showBlank = false;
+            entries.push({key: '', value: ''});
         }
 
         entries.forEach(function(entry) {
@@ -114,7 +116,6 @@ iD.ui.RawTagEditor = function(context) {
             if (d3.event.keyCode === 9 && !d3.event.shiftKey &&
                 $list.selectAll('li:last-child input.value').node() === this) {
                 addTag();
-                d3.event.preventDefault();
             }
         }
 
@@ -182,9 +183,14 @@ iD.ui.RawTagEditor = function(context) {
         }
 
         function addTag() {
-            tags[''] = '';
-            content($wrap);
-            $list.selectAll('li:last-child input.key').node().focus();
+            // Wrapped in a setTimeout in case it's being called from a blur
+            // handler. Without the setTimeout, the call to `content` would
+            // wipe out the pending value change.
+            setTimeout(function() {
+                showBlank = true;
+                content($wrap);
+                $list.selectAll('li:last-child input.key').node().focus();
+            }, 0);
         }
     }