diff --git a/src/maps/mapObjectControllers/AgMapController.tsx b/src/maps/mapObjectControllers/AgMapController.tsx
index 9f23bf0..7001f1a 100644
--- a/src/maps/mapObjectControllers/AgMapController.tsx
+++ b/src/maps/mapObjectControllers/AgMapController.tsx
@@ -703,7 +703,12 @@ import { Result } from "@mapbox/mapbox-gl-geocoder";
                 </Grid>
               </Grid>
               <Grid size={3}>
-                <Button style={{ margin: "auto" }} onClick={() => setOpenFMSettings(true)}>
+                <Button 
+                  style={{ margin: "auto" }} 
+                  onClick={() => {
+                    setOpenFMSettings(true)
+                    setAnchorFieldMarker(null)
+                  }}>
                   <Edit />
                 </Button>
               </Grid>