diff --git a/frontend/components/AddressDialog.vue b/frontend/components/AddressDialog.vue
new file mode 100644
index 00000000..c6c59da8
--- /dev/null
+++ b/frontend/components/AddressDialog.vue
@@ -0,0 +1,50 @@
+<template>
+  <Dialog
+    :visible="props.visible"
+    header="Sélectionner une adresse"
+    :modal="true"
+    :closable="true"
+    dismissable-mask
+    :style="{ width: '40rem' }"
+    @update:visible="value => emits('update:visible', value)"
+  >
+    <AddressPicker v-model="editedAddress" />
+    <template #footer>
+      <div class="pt-1">
+        <Button
+          label="Annuler"
+          severity="secondary"
+          @click="emits('update:visible', false)"
+        />
+        <Button
+          label="Sélectionner"
+          :disabled="!editedAddress"
+          @click="editedAddress && emits('select', editedAddress)"
+        />
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import type { UnprocessedLocation } from '~/lib'
+
+const props = defineProps<{
+  address: UnprocessedLocation | undefined
+  visible: boolean
+}>()
+
+const emits = defineEmits<{
+  'update:visible': [boolean]
+  'select': [UnprocessedLocation]
+}>()
+
+const editedAddress = ref<UnprocessedLocation | undefined>(props.address)
+
+watch([
+  () => props.visible,
+  () => props.address,
+], () => {
+  editedAddress.value = props.address
+})
+</script>
diff --git a/frontend/components/AddressPicker.vue b/frontend/components/AddressPicker.vue
new file mode 100644
index 00000000..3f5368d7
--- /dev/null
+++ b/frontend/components/AddressPicker.vue
@@ -0,0 +1,114 @@
+<template>
+  <div>
+    <form @submit.prevent="searchNominatim">
+      <InputGroup class="mb-6 mt-2">
+        <InputText
+          v-model="search"
+          placeholder="Rechercher une adresse"
+        />
+        <Button
+          v-tooltip.bottom="'Lancer la recherche'"
+          aria-label="Lancer la recherche"
+          severity="primary"
+          type="submit"
+        >
+          <template #icon>
+            <AppIcon icon-name="search" />
+          </template>
+        </Button>
+      </InputGroup>
+    </form>
+
+    <div v-if="searched && !nominatimResult">
+      <Message severity="error">
+        Aucun résultat trouvé
+      </Message>
+    </div>
+    <div v-else-if="nominatimResult">
+      <small class="text-secondary block mb-1">{{ nominatimResult.display_name }}</small>
+    </div>
+
+    <div v-if="coordinate">
+      <CoordinatePickerMap
+        class="!h-[18rem]"
+        :center="transformedCenter"
+        :zoom="14"
+        :model-value="transformedCoordinate"
+        @update:model-value="value => onMapClick(value)"
+      />
+      <small class="text-secondary text-center block mt-1">Cliquer sur la carte pour déplacer le point si besoin.</small>
+    </div>
+
+    <div v-if="coordinate">
+      <AdminInputTextField
+        id="address_name"
+        v-model="name"
+        class="mt-6"
+        label="Intitulé complet de l'adresse"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { Coordinate } from 'ol/coordinate'
+import { transform } from 'ol/proj'
+import type { UnprocessedLocation } from '~/lib'
+import { freeFormSearch } from '~/lib/nominatim'
+import type { Result } from '~/lib/nominatim'
+
+const props = defineProps<{
+  modelValue: UnprocessedLocation | undefined
+}>()
+
+const emits = defineEmits<{
+  'update:modelValue': [UnprocessedLocation | undefined]
+}>()
+
+const search = ref('')
+const nominatimResult = ref<Result | undefined>()
+const searched = ref(false)
+const coordinate = ref<Coordinate | undefined>(props.modelValue ? [props.modelValue.long, props.modelValue.lat] : undefined)
+const name = ref<string>(props.modelValue ? props.modelValue.plain_text : '')
+
+const transformedCoordinate = computed(() => {
+  if (!coordinate.value) return undefined
+
+  return transform([
+    coordinate.value[0], coordinate.value[1],
+  ], 'EPSG:4326', 'EPSG:3857')
+})
+
+const transformedCenter = computed(() => transformedCoordinate.value || [0, 0])
+
+async function searchNominatim() {
+  const query = search.value
+  const results = await freeFormSearch(query)
+  searched.value = true
+
+  if (results[0]) {
+    nominatimResult.value = results[0]
+    coordinate.value = [results[0].lon, results[0].lat]
+    name.value = query
+  }
+  else {
+    nominatimResult.value = undefined
+    coordinate.value = undefined
+    name.value = ''
+  }
+}
+
+function onMapClick(c: Coordinate) {
+  coordinate.value = transform(c, 'EPSG:3857', 'EPSG:4326')
+}
+
+watch([
+  () => coordinate.value,
+  () => name.value,
+], () => {
+  if (coordinate.value && name.value.trim() != '')
+    emits('update:modelValue', { lat: coordinate.value[1]!, long: coordinate.value[0]!, plain_text: name.value.trim() })
+  else
+    emits('update:modelValue', undefined)
+})
+</script>
diff --git a/frontend/components/CoordinatePickerMap.vue b/frontend/components/CoordinatePickerMap.vue
new file mode 100644
index 00000000..861d29db
--- /dev/null
+++ b/frontend/components/CoordinatePickerMap.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="map_container">
+    <ol-map
+      ref="mapRef"
+      class="map"
+      :load-tiles-while-animating="true"
+      :load-tiles-while-interacting="true"
+      @singleclick="(event: MapBrowserEvent) => emits('update:modelValue', event.coordinate)"
+    >
+      <ol-view
+        projection="EPSG:3857"
+      />
+
+      <ol-tile-layer>
+        <ol-source-osm />
+      </ol-tile-layer>
+
+      <ol-overlay
+        v-if="props.modelValue"
+        :position="props.modelValue"
+        :stop-event="true"
+      >
+        <ViewerMapMarker
+          :callback-item="null"
+          :width="24"
+          :height="38"
+          :highlighted="false"
+          :border-color="props.borderColor"
+          :fill-color="props.fillColor"
+          :icon-hash="props.iconHash"
+        />
+      </ol-overlay>
+    </ol-map>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { MapBrowserEvent } from 'ol'
+import type Map from 'ol/Map'
+import type { Coordinate } from 'ol/coordinate'
+
+const props = defineProps<{
+  modelValue: Coordinate | undefined
+  center: Coordinate
+  zoom: number
+  borderColor?: string | undefined
+  fillColor?: string | undefined
+  iconHash?: string | null | undefined
+}>()
+
+const emits = defineEmits<{
+  'update:modelValue': [Coordinate]
+}>()
+
+const mapRef = ref<{ map: Map }>()
+
+onMounted(resetZoom)
+watch([
+  () => props.zoom,
+], () => resetZoom(true))
+
+function resetZoom(animated: boolean = false) {
+  const map = mapRef.value?.map
+  if (!map) return
+  const view = map.getView()
+
+  view.setMinZoom(Math.min(2, props.zoom))
+  view.setMaxZoom(Math.max(20, props.zoom))
+  if (animated)
+    view.animate({ zoom: props.zoom })
+  else
+    view.setZoom(props.zoom)
+}
+
+onMounted(resetCenter)
+watch([
+  () => props.center,
+  () => props.modelValue,
+], () => resetCenter(true))
+
+function resetCenter(animated: boolean = false) {
+  const map = mapRef.value?.map
+  if (!map) return
+  const view = map.getView()
+
+  if (animated)
+    view.animate({ center: props.modelValue || props.center })
+  else
+    view.setCenter(props.modelValue || props.center)
+}
+</script>
+
+<style scoped>
+.map_container,
+.map {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/frontend/components/NominatimPicker.vue b/frontend/components/NominatimPicker.vue
deleted file mode 100644
index e083912b..00000000
--- a/frontend/components/NominatimPicker.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <div>
-    <form @submit.prevent="searchNominatim">
-      <InputGroup class="mb-6 mt-2">
-        <InputText
-          v-model="locationInput"
-          placeholder="Rechercher une adresse"
-        />
-        <Button
-          v-tooltip.bottom="'Lancer la recherche'"
-          aria-label="Lancer la recherche"
-          severity="primary"
-          type="submit"
-        >
-          <template #icon>
-            <AppIcon icon-name="search" />
-          </template>
-        </Button>
-      </InputGroup>
-    </form>
-
-    <div v-if="!results.length && resultsSearched">
-      <Message severity="error">
-        Aucun résultat trouvé
-      </Message>
-    </div>
-    <div
-      v-else-if="locationSelected && resultsSearched"
-    >
-      <SingleEntityMap
-        class="!h-80"
-        :coordinates="transformedCoordinates"
-        :locked="false"
-        category-id="default"
-        :zoom="10"
-      />
-      <small class="text-secondary flex ">Addresse : {{ results[0].display_name }}</small>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { transform } from 'ol/proj'
-import type { UnprocessedLocation } from '~/lib'
-import { freeFormSearch } from '~/lib/nominatim'
-import type { Result } from '~/lib/nominatim'
-
-const props = defineProps<{ modelValue: UnprocessedLocation | null }>()
-const emits = defineEmits(['select'])
-
-const locationInput = ref(props.modelValue?.plain_text || '')
-const locationSelected = ref(props.modelValue)
-const results = ref<Result[]>([])
-const resultsSearched = ref(false)
-
-const transformedCoordinates = computed(() => {
-  if (!props.modelValue) return [[0, 0]]
-
-  return [
-    transform([
-      props.modelValue!.long, props.modelValue!.lat,
-    ], 'EPSG:4326', 'EPSG:3857')]
-})
-
-async function searchNominatim() {
-  results.value = await freeFormSearch(locationInput.value)
-  resultsSearched.value = true
-  if (results.value.length !== 0) {
-    locationSelected.value = {
-      lat: results.value[0].lat,
-      long: results.value[0].lon,
-      plain_text: locationInput.value,
-    }
-    emits('select', locationSelected.value)
-  }
-}
-</script>
diff --git a/frontend/components/form/Adresses.vue b/frontend/components/form/Adresses.vue
index 88207ca9..7c7a5035 100644
--- a/frontend/components/form/Adresses.vue
+++ b/frontend/components/form/Adresses.vue
@@ -47,31 +47,11 @@
     </Column>
   </DataTable>
 
-  <Dialog
-    v-model:visible="displayNominatimPicker"
-    header="Sélectionner une adresse"
-    :modal="true"
-    :closable="true"
-    dismissable-mask
-    :style="{ width: '40rem' }"
-  >
-    <NominatimPicker
-      v-model="currentlyEditedLocation!.loc"
-      @select="handleAddressSelect"
-    />
-    <template #footer>
-      <Button
-        label="Annuler"
-        severity="secondary"
-        @click="displayNominatimPicker = false"
-      />
-      <Button
-        label="Sélectionner"
-        :disabled="!addressSelected"
-        @click="applyAddressChanges"
-      />
-    </template>
-  </Dialog>
+  <AddressDialog
+    v-model:visible="displayAddressDialog"
+    :address="editedLocation"
+    @select="value => onAddressSelected(value)"
+  />
 </template>
 
 <script setup lang="ts">
@@ -85,43 +65,45 @@ const emit = defineEmits(['update:locations'])
 
 const toast = useToast()
 
-const currentlyEditedLocation = ref<{ index: number, loc: UnprocessedLocation } | null>(null)
-const displayNominatimPicker = ref(false)
-const addressSelected = ref(false)
+const displayAddressDialog = ref(false)
+
+const editedIndex = ref<number | undefined>()
+const editedLocation = ref<UnprocessedLocation | undefined>()
 
 function addNewAddress() {
-  currentlyEditedLocation.value = { index: props.locations.length, loc: { plain_text: '', lat: 0, long: 0 } }
-  displayNominatimPicker.value = true
-  addressSelected.value = false
+  editedIndex.value = undefined
+  editedLocation.value = undefined
+  displayAddressDialog.value = true
 }
 
-function removeAddress(index: number) {
-  const updatedLocations = [...props.locations]
-  updatedLocations.splice(index, 1)
-  emit('update:locations', updatedLocations)
+function editAddress(index: number) {
+  editedIndex.value = index
+  editedLocation.value = props.locations[index]
+  displayAddressDialog.value = true
 }
 
-function editAddress(index: number) {
-  currentlyEditedLocation.value = { index: index, loc: { ...props.locations[index] } }
-  displayNominatimPicker.value = true
-  addressSelected.value = false
+function removeAddress(index: number) {
+  const locations = [...props.locations]
+  locations.splice(index, 1)
+  emit('update:locations', locations)
 }
 
-function applyAddressChanges() {
-  if (addressSelected.value) {
-    if (props.locations.some(loc => loc.plain_text == currentlyEditedLocation.value!.loc.plain_text))
-      toast.add({ severity: 'error', summary: 'Erreur', detail: `Addresse déjà présente`, life: 3000 })
-    else {
-      const updatedLocations = [...props.locations]
-      updatedLocations[currentlyEditedLocation.value!.index] = { ...currentlyEditedLocation.value!.loc }
-      emit('update:locations', updatedLocations)
-    }
-    displayNominatimPicker.value = false
+function onAddressSelected(address: UnprocessedLocation) {
+  const isDuplicate = props.locations.some((loc, index) => {
+    return index != editedIndex.value && loc.plain_text == address.plain_text
+  })
+  if (isDuplicate) {
+    toast.add({ severity: 'error', summary: 'Erreur', detail: `Addresse déjà présente`, life: 3000 })
+    return
   }
-}
 
-function handleAddressSelect(location: UnprocessedLocation) {
-  currentlyEditedLocation.value!.loc = location
-  addressSelected.value = true
+  const locations = [...props.locations]
+  if (editedIndex.value == undefined)
+    locations.push({ ...address })
+  else
+    locations[editedIndex.value] = { ...address }
+  emit('update:locations', locations)
+
+  displayAddressDialog.value = false
 }
 </script>