diff --git a/src/index.js b/src/index.js
index 0e7692d2..57aa2e2a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,5 @@
 /* globals map:true, overpassFrontend:true, currentPath:true, options:true, baseCategory:true, overpassUrl:true showDetails */
 
-var LeafletGeoSearch = require('leaflet-geosearch')
 const tabs = require('modulekit-tabs')
 
 var OverpassFrontend = require('overpass-frontend')
@@ -35,6 +34,7 @@ require('./wikipedia')
 require('./image')
 require('./addCategories')
 require('./permalink')
+require('./leaflet-geo-search')
 let exportAll = require('./exportAll')
 
 window.onload = function () {
@@ -63,15 +63,6 @@ function onload2 (initState) {
     }).addTo(map)
   }
 
-  // Add Geo Search
-  var provider = new LeafletGeoSearch.OpenStreetMapProvider()
-  var searchControl = new LeafletGeoSearch.GeoSearchControl({
-    provider: provider,
-    showMarker: false,
-    retainZoomLevel: true
-  })
-  map.addControl(searchControl)
-
   // Geo location
   L.control.locate({
     keepCurrentZoomLevel: true,
diff --git a/src/leaflet-geo-search.js b/src/leaflet-geo-search.js
new file mode 100644
index 00000000..3a2f8895
--- /dev/null
+++ b/src/leaflet-geo-search.js
@@ -0,0 +1,12 @@
+const LeafletGeoSearch = require('leaflet-geosearch')
+
+register_hook('init', function () {
+  // Add Geo Search
+  var provider = new LeafletGeoSearch.OpenStreetMapProvider()
+  var searchControl = new LeafletGeoSearch.GeoSearchControl({
+    provider: provider,
+    showMarker: false,
+    retainZoomLevel: true
+  })
+  global.map.addControl(searchControl)
+})