diff --git a/js/id/ui/geocoder.js b/js/id/ui/geocoder.js
index e93eaa9dc..35b68dd9d 100644
--- a/js/id/ui/geocoder.js
+++ b/js/id/ui/geocoder.js
@@ -28,8 +28,9 @@ iD.geocoder = function() {
         function setVisible(show) {
             button.classed('active', show);
             gcForm.classed('hide', !show);
-            if (show) d3.select('.map-overlay input').node().focus();
-            else map.surface.node().focus();
+            var input_node = d3.select('.map-overlay input').node();
+            if (show) input_node.focus();
+            else input_node.blur();
         }
 
         var button = selection.append('button')