diff --git a/js/id/ui/preset.js b/js/id/ui/preset.js
index 37a10f3df..7f84103ce 100644
--- a/js/id/ui/preset.js
+++ b/js/id/ui/preset.js
@@ -85,13 +85,7 @@ iD.ui.preset = function(context, entity, preset) {
         d3.event.stopPropagation();
         d3.event.preventDefault();
 
-        _.forEach(shown(), function(other) {
-            if (other.id === field.id) {
-                other.reference.toggle();
-            } else {
-                other.reference.hide();
-            }
-        });
+        field.reference.toggle();
 
         render();
     }
diff --git a/js/id/ui/taglist.js b/js/id/ui/taglist.js
index dc100d7d1..0230382d7 100644
--- a/js/id/ui/taglist.js
+++ b/js/id/ui/taglist.js
@@ -102,13 +102,7 @@ iD.ui.Taglist = function(context, entity) {
 
         row.call(iD.ui.TagReferenceButton()
             .on('click', function(tag) {
-                tags.forEach(function(other) {
-                    if (other.key === tag.key) {
-                        other.reference.toggle();
-                    } else {
-                        other.reference.hide();
-                    }
-                });
+                tag.reference.toggle();
             }));
 
         row.each(function(tag) {