diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index ab52a2a62..b8c834cc8 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -136,7 +136,9 @@ iD.Inspector = function() {
                     .map(entries);
             }
 
-            draw(d3.entries(_.clone(entity.tags)));
+            var tags = d3.entries(_.clone(entity.tags));
+            if (tags.length === 0) tags = [{ key: '', value: '' }];
+            draw(tags);
 
             selection.select('input').node().focus();