diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 5258f8701..1f22a7c81 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -346,10 +346,6 @@ iD.Map = function(context) {
                 vZoomDiff = Math.log(Math.abs(vFactor)) / Math.LN2,
                 newZoom = map.zoom() - Math.max(hZoomDiff, vZoomDiff);
 
-                if(newZoom > 19){
-                        newZoom = 19;
-                }
-
             map.centerZoom(extent.center(), newZoom);
         }
     };
diff --git a/js/id/ui/geocoder.js b/js/id/ui/geocoder.js
index e6695792f..6d4d39d03 100644
--- a/js/id/ui/geocoder.js
+++ b/js/id/ui/geocoder.js
@@ -19,6 +19,7 @@ iD.ui.geocoder = function() {
                 }
                 var bounds = resp[0].boundingbox;
                 map.extent(iD.geo.Extent([parseFloat(bounds[3]), parseFloat(bounds[0])], [parseFloat(bounds[2]), parseFloat(bounds[1])]));
+		if (map.zoom() > 19) map.zoom(19);
             });
         }