diff --git a/html/static/js/map-locator.js b/html/static/js/map-locator.js
index a448ed62..ab10e65a 100644
--- a/html/static/js/map-locator.js
+++ b/html/static/js/map-locator.js
@@ -1,4 +1,3 @@
-var map = null;
 // A map that can be used to locate a single point by setting its location explicitly
 // or by allowing the user to move a marker.
 class MapLocator extends HTMLElement {
@@ -55,22 +54,33 @@ class MapLocator extends HTMLElement {
 		}));
 		map.addControl(new mapboxgl.NavigationControl());
 		*/
+		this._map.on("click", (e) => {
+			e.preventDefault();
+			console.log("internal click", e);
+			this.dispatchEvent(new CustomEvent("click", {
+				bubbles: true,
+				composed: true, // Allows event to cross shadow DOM boundary
+				detail: { 
+					lngLat: e.lngLat,
+				},
+			}));
+		});
 		this._map.on("load", () => {
 			console.log("map loaded");
-			this.dispatchEvent(new CustomEvent("load"), {
+			this.dispatchEvent(new CustomEvent("load", {
 				bubbles: true,
 				composed: true, // Allows event to cross shadow DOM boundary
 				detail: {
 					map: this
 				}
-			});
+			}));
 		});
 		this._map.on("zoomend", (e) => {
-			this.dispatchEvent(new CustomEvent("zoomend"), {
+			this.dispatchEvent(new CustomEvent("zoomend", {
 				bubbles: true,
 				composed: true,
 				detail: e,
-			});
+			}));
 		});
 	}
 
diff --git a/rmo/template/nuisance.html b/rmo/template/nuisance.html
index 47839138..10720db9 100644
--- a/rmo/template/nuisance.html
+++ b/rmo/template/nuisance.html
@@ -10,6 +10,19 @@
 <script src="/static/js/photo-upload.js"></script>
 <script>
 const MAPBOX_ACCESS_TOKEN = "{{.MapboxToken}}";
+async function handleMapClick(mapLocator, lngLat) {
+	mapLocator.SetMarker(lngLat);
+	const response = await geocodeReverse(MAPBOX_ACCESS_TOKEN, {
+		lat: lngLat.lat,
+		lng: lngLat.lng,
+	});
+	console.log("click reverse geocode", response);
+	if (response !== undefined && response.features.length > 0) {
+		const addressInput = document.querySelector("address-input");
+		addressInput.SetValue(response.features[0]);
+		setLocationInputs(response.features[0]);
+	}
+}
 async function handleMarkerDrag(lngLat) {
 	const response = await geocodeReverse(MAPBOX_ACCESS_TOKEN, {
 		lat: lngLat.lat,
@@ -118,6 +131,12 @@ document.addEventListener('DOMContentLoaded', function() {
 	mapLocator.addEventListener("zoomend", function(e) {
 		mapZoom.value = e.target.GetZoom();
 	});
+	mapLocator.addEventListener("click", (e) => {
+		// We get some events without the lngLat
+		if (e.detail !== undefined && e.detail.lngLat !== undefined) {
+			handleMapClick(mapLocator, e.detail.lngLat);
+		}
+	});
 	mapLocator.addEventListener("markerdragend", (e) => {
 		const marker = event.detail.marker;
 		const lngLat = marker.getLngLat();