diff --git a/js/id/ui/entity_editor.js b/js/id/ui/entity_editor.js
index e6bdc650b..5265f9efd 100644
--- a/js/id/ui/entity_editor.js
+++ b/js/id/ui/entity_editor.js
@@ -82,8 +82,7 @@ iD.ui.EntityEditor = function(context, entity) {
             .call(iD.ui.PresetIcon(context.geometry(entity.id)));
 
         presetUI = iD.ui.preset(context, entity, preset)
-            .on('change', changeTags)
-            .on('close', browse);
+            .on('change', changeTags);
 
         var tageditorpreset = editorwrap.append('div')
             .attr('class', 'inspector-preset cf fillL col12')
diff --git a/js/id/ui/preset.js b/js/id/ui/preset.js
index e28755bfb..17800535f 100644
--- a/js/id/ui/preset.js
+++ b/js/id/ui/preset.js
@@ -1,6 +1,6 @@
 iD.ui.preset = function(context, entity, preset) {
     var original = context.graph().base().entities[entity.id],
-        event = d3.dispatch('change', 'close'),
+        event = d3.dispatch('change'),
         fields = [],
         tags = {},
         formwrap,
@@ -10,7 +10,6 @@ iD.ui.preset = function(context, entity, preset) {
         field = _.clone(field);
 
         field.input = iD.ui.preset[field.type](field, context)
-            .on('close', event.close)
             .on('change', event.change);
 
         field.reference = iD.ui.TagReference({key: field.key});
diff --git a/js/id/ui/preset/access.js b/js/id/ui/preset/access.js
index 37d375faf..dcfcff10f 100644
--- a/js/id/ui/preset/access.js
+++ b/js/id/ui/preset/access.js
@@ -1,5 +1,5 @@
 iD.ui.preset.access = function(field, context) {
-    var event = d3.dispatch('change', 'close'),
+    var event = d3.dispatch('change'),
         entity,
         items;
 
diff --git a/js/id/ui/preset/address.js b/js/id/ui/preset/address.js
index 79118f9f4..04073bf0d 100644
--- a/js/id/ui/preset/address.js
+++ b/js/id/ui/preset/address.js
@@ -1,6 +1,6 @@
 iD.ui.preset.address = function(field, context) {
 
-    var event = d3.dispatch('change', 'close'),
+    var event = d3.dispatch('change'),
         housename,
         housenumber,
         street,
@@ -36,9 +36,6 @@ iD.ui.preset.address = function(field, context) {
     }
 
     function address(selection) {
-
-        function close() { return iD.behavior.accept().on('accept', event.close); }
-
         var wrap = selection.append('div')
             .attr('class', 'preset-input-wrap');
 
@@ -48,16 +45,14 @@ iD.ui.preset.address = function(field, context) {
             .attr('class', 'addr-housename')
             .attr('id', 'preset-input-' + field.id)
             .on('blur', change)
-            .on('change', change)
-            .call(close());
+            .on('change', change);
 
         housenumber = wrap.append('input')
             .property('type', 'text')
             .attr('placeholder', field.t('placeholders.number'))
             .attr('class', 'addr-number')
             .on('blur', change)
-            .on('change', change)
-            .call(close());
+            .on('change', change);
 
         street = wrap.append('input')
             .property('type', 'text')
@@ -72,16 +67,14 @@ iD.ui.preset.address = function(field, context) {
             .attr('placeholder', field.t('placeholders.city'))
             .attr('class', 'addr-city')
             .on('blur', change)
-            .on('change', change)
-            .call(close());
+            .on('change', change);
 
         postcode = wrap.append('input')
             .property('type', 'text')
             .attr('placeholder', field.t('placeholders.postcode'))
             .attr('class', 'addr-postcode')
             .on('blur', change)
-            .on('change', change)
-            .call(close());
+            .on('change', change);
     }
 
     function change() {
diff --git a/js/id/ui/preset/check.js b/js/id/ui/preset/check.js
index 19f9031d0..d4a9f78de 100644
--- a/js/id/ui/preset/check.js
+++ b/js/id/ui/preset/check.js
@@ -1,6 +1,6 @@
 iD.ui.preset.check = function(field) {
 
-    var event = d3.dispatch('change', 'close'),
+    var event = d3.dispatch('change'),
         values = ['', 'yes', 'no'],
         value = '',
         box,
diff --git a/js/id/ui/preset/combo.js b/js/id/ui/preset/combo.js
index 6ac73195d..033576961 100644
--- a/js/id/ui/preset/combo.js
+++ b/js/id/ui/preset/combo.js
@@ -1,6 +1,6 @@
 iD.ui.preset.combo = function(field) {
 
-    var event = d3.dispatch('change', 'close'),
+    var event = d3.dispatch('change'),
         input;
 
     function combo(selection) {
diff --git a/js/id/ui/preset/defaultcheck.js b/js/id/ui/preset/defaultcheck.js
index cf3c5d589..f871e826d 100644
--- a/js/id/ui/preset/defaultcheck.js
+++ b/js/id/ui/preset/defaultcheck.js
@@ -1,6 +1,6 @@
 iD.ui.preset.defaultcheck = function(field) {
 
-    var event = d3.dispatch('change', 'close'),
+    var event = d3.dispatch('change'),
         input;
 
     var check = function(selection) {
diff --git a/js/id/ui/preset/input.js b/js/id/ui/preset/input.js
index f74c89a8c..416457805 100644
--- a/js/id/ui/preset/input.js
+++ b/js/id/ui/preset/input.js
@@ -4,7 +4,7 @@ iD.ui.preset.tel =
 iD.ui.preset.email =
 iD.ui.preset.url = function(field) {
 
-    var event = d3.dispatch('change', 'close'),
+    var event = d3.dispatch('change'),
         input;
 
     function i(selection) {
@@ -13,8 +13,7 @@ iD.ui.preset.url = function(field) {
             .attr('id', 'preset-input-' + field.id)
             .attr('placeholder', field.placeholder || '')
             .on('blur', change)
-            .on('change', change)
-            .call(iD.behavior.accept().on('accept', event.close));
+            .on('change', change);
 
         function pm(elem, x) {
             var num = elem.value ?
diff --git a/js/id/ui/preset/localized.js b/js/id/ui/preset/localized.js
index 22d6eeeea..9fe5b8b52 100644
--- a/js/id/ui/preset/localized.js
+++ b/js/id/ui/preset/localized.js
@@ -1,6 +1,6 @@
 iD.ui.preset.localized = function(field, context) {
 
-    var event = d3.dispatch('change', 'close'),
+    var event = d3.dispatch('change'),
         wikipedia = iD.wikipedia(),
         input, localizedInputs, wikiTitles;
 
@@ -12,8 +12,7 @@ iD.ui.preset.localized = function(field, context) {
             .attr('class', 'localized-main')
             .attr('placeholder', field.placeholder || '')
             .on('blur', change)
-            .on('change', change)
-            .call(iD.behavior.accept().on('accept', event.close));
+            .on('change', change);
 
         var translateButton = selection.append('button')
             .attr('class', 'button-input-action localized-add minor')
diff --git a/js/id/ui/preset/maxspeed.js b/js/id/ui/preset/maxspeed.js
index c0811e034..fdcb07bdd 100644
--- a/js/id/ui/preset/maxspeed.js
+++ b/js/id/ui/preset/maxspeed.js
@@ -1,6 +1,6 @@
 iD.ui.preset.maxspeed = function(field, context) {
 
-    var event = d3.dispatch('change', 'close'),
+    var event = d3.dispatch('change'),
         entity,
         imperial,
         unitInput,
diff --git a/js/id/ui/preset/radio.js b/js/id/ui/preset/radio.js
index 453fedf65..5d6cd771a 100644
--- a/js/id/ui/preset/radio.js
+++ b/js/id/ui/preset/radio.js
@@ -1,6 +1,6 @@
 iD.ui.preset.radio = function(field) {
 
-    var event = d3.dispatch('change', 'close'),
+    var event = d3.dispatch('change'),
         buttons;
 
     function radio(selection) {
diff --git a/js/id/ui/preset/textarea.js b/js/id/ui/preset/textarea.js
index b4f0c6c6a..ec623ba9a 100644
--- a/js/id/ui/preset/textarea.js
+++ b/js/id/ui/preset/textarea.js
@@ -1,6 +1,6 @@
 iD.ui.preset.textarea = function(field) {
 
-    var event = d3.dispatch('change', 'close'),
+    var event = d3.dispatch('change'),
         input;
 
     function i(selection) {
@@ -9,8 +9,7 @@ iD.ui.preset.textarea = function(field) {
             .attr('placeholder', field.placeholder || '')
             .attr('maxlength', 255)
             .on('blur', change)
-            .on('change', change)
-            .call(iD.behavior.accept().on('accept', event.close));
+            .on('change', change);
     }
 
     function change() {
diff --git a/js/id/ui/preset/wikipedia.js b/js/id/ui/preset/wikipedia.js
index d24063ad9..c3f1dd5ea 100644
--- a/js/id/ui/preset/wikipedia.js
+++ b/js/id/ui/preset/wikipedia.js
@@ -1,6 +1,6 @@
 iD.ui.preset.wikipedia = function(field, context) {
 
-    var event = d3.dispatch('change', 'close'),
+    var event = d3.dispatch('change'),
         wikipedia = iD.wikipedia(),
         language = iD.data.wikipedia[0],
         link, entity, lang, title;