diff --git a/app/scripts/components/common/map/controls/geocoder.tsx b/app/scripts/components/common/map/controls/geocoder.tsx
index edf0b5649..603c0931b 100644
--- a/app/scripts/components/common/map/controls/geocoder.tsx
+++ b/app/scripts/components/common/map/controls/geocoder.tsx
@@ -1,15 +1,48 @@
+import { useCallback } from 'react';
 import MapboxGeocoder from '@mapbox/mapbox-gl-geocoder';
 
 import { useControl } from 'react-map-gl';
 
+export function getZoomFromBbox(bbox: [number, number, number, number]): number {
+  const latMax = Math.max(bbox[3], bbox[1]);
+  const lngMax = Math.max(bbox[2], bbox[0]);
+  const latMin = Math.min(bbox[3], bbox[1]);
+  const lngMin = Math.min(bbox[2], bbox[0]);
+  const maxDiff = Math.max(latMax - latMin, lngMax - lngMin);
+  if (maxDiff < 360 / Math.pow(2, 20)) {
+    return 21;
+} else {
+    const zoomLevel = Math.floor(-1*( (Math.log(maxDiff)/Math.log(2)) - (Math.log(360)/Math.log(2))));
+    if (zoomLevel < 1) return 1;
+    else return zoomLevel;
+  }
+}
+
 export default function GeocoderControl() {
+
+  const handleGeocoderResult = useCallback((map, geocoder) => ({ result }) => {
+    geocoder.clear();
+    geocoder._inputEl.blur();
+    // Pass arbiturary number for zoom if there is no bbox
+    const zoom = result.bbox? getZoomFromBbox(result.bbox): 14;
+    map.flyTo({
+      center: result.center,
+      zoom
+    });
+  }, []);
+
   useControl(
-    () => {
-      return new MapboxGeocoder({
+    ({ map }) => {
+      const geocoder = new MapboxGeocoder({
         accessToken: process.env.MAPBOX_TOKEN,
         marker: false,
-        collapsed: true
+        collapsed: true,
+        // Because of Mapbox issue: https://github.com/mapbox/mapbox-gl-js/issues/12565
+        // We are doing manual centering for now
+        flyTo: false
       });
+      geocoder.on('result', handleGeocoderResult(map, geocoder));
+      return geocoder;
     },
     {
       position: 'top-right'
diff --git a/app/scripts/components/common/mapbox/map.tsx b/app/scripts/components/common/mapbox/map.tsx
index 9bb3cfa69..a6d508f33 100644
--- a/app/scripts/components/common/mapbox/map.tsx
+++ b/app/scripts/components/common/mapbox/map.tsx
@@ -28,6 +28,7 @@ import MapCoords from './map-coords';
 
 import { useMapStyle } from './layers/styles';
 import { BasemapId, Option } from './map-options/basemaps';
+import { getZoomFromBbox } from '$components/common/map/controls/geocoder';
 import { round } from '$utils/format';
 
 mapboxgl.accessToken = process.env.MAPBOX_TOKEN ?? '';
@@ -146,13 +147,21 @@ export function SimpleMap(props: SimpleMapProps): ReactElement {
       const geocoderControl = new MapboxGeocoder({
         accessToken: mapboxgl.accessToken,
         marker: false,
-        collapsed: true
+        collapsed: true, 
+        // Because of Mapbox issue: https://github.com/mapbox/mapbox-gl-js/issues/12565
+        // We are doing manual centering for now
+        flyTo: false
       }) as MapboxGeocoder & { _inputEl: HTMLInputElement };
 
       // Close the geocoder when the result is selected.
-      geocoderControl.on('result', () => {
+      geocoderControl.on('result', ({ result }) => {
         geocoderControl.clear();
         geocoderControl._inputEl.blur();
+        const zoom = result.bbox? getZoomFromBbox(result.bbox): 14;
+        mapRef.current?.flyTo({
+          center: result.center,
+          zoom
+        });
       });
 
       mbMap.addControl(geocoderControl, 'top-left');