diff --git a/js/id/modes/select.js b/js/id/modes/select.js
index 56e93988e..985ccd22c 100644
--- a/js/id/modes/select.js
+++ b/js/id/modes/select.js
@@ -148,7 +148,12 @@ iD.modes.Select = function(context, selectedIDs) {
 
         function ret() {
             if (!context.inIntro()) {
-                context.enter(iD.modes.Browse(context));
+                // only accept changes if focused on a non-search input field.. #2912, #2380
+                var el = document.activeElement,
+                    tagName = el && el.tagName.toLowerCase();
+                if (tagName === 'input' && el.type !== 'search') {
+                    context.enter(iD.modes.Browse(context));
+                }
             }
         }