diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index bc15ed516..cef84ca75 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -56,12 +56,12 @@ iD.ui.Inspector = function(context, entity) {
             .tags(entity.tags)
             .on('changeTags', changeTags)
             .on('close', browse)
-            .on('choose', function() {
+            .on('choose', function(preset) {
                 panewrap
                     .transition()
                     .style('right', '-100%');
 
-                presetLayer.call(presetGrid, true);
+                presetLayer.call(presetGrid, preset);
             });
 
         var initial = entity.isNew() && _.without(Object.keys(entity.tags), 'area').length === 0;
diff --git a/js/id/ui/preset_grid.js b/js/id/ui/preset_grid.js
index 2f4d1664a..9f3514c80 100644
--- a/js/id/ui/preset_grid.js
+++ b/js/id/ui/preset_grid.js
@@ -191,6 +191,7 @@ iD.ui.PresetGrid = function(context, entity) {
             var entered = entries.enter()
                 .append('div')
                 .attr('class','grid-button-wrap col4 grid-entry-wrap')
+                .classed('current', function(d) { return d === preset; })
                     .append('button')
                     .attr('class', 'grid-entry')
                     .on('click', choose);
diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js
index 4f081d1fd..8b98f54b7 100644
--- a/js/id/ui/tag_editor.js
+++ b/js/id/ui/tag_editor.js
@@ -35,7 +35,7 @@ iD.ui.TagEditor = function(context, entity) {
                 .title(t('inspector.back_tooltip'))
                 .placement('left'))
             .on('click', function() {
-                event.choose();
+                event.choose(preset);
             })
             .append('span').attr('class','icon back');