diff --git a/src/assets/scss/_forms.scss b/src/assets/scss/_forms.scss
index 9d279b20..485875a1 100644
--- a/src/assets/scss/_forms.scss
+++ b/src/assets/scss/_forms.scss
@@ -3,7 +3,7 @@
         display: block;
         margin-bottom: .35rem;
         font-size: .9em;
-        font-weight: 500;
+        font-weight: 600;
     }
 
     .form-input {
@@ -26,4 +26,10 @@
             }
         }
     }
+
+    .form-error {
+        margin-top: .3em;
+        font-size: .75em;
+        color: var(--red-500);
+    }
 }
\ No newline at end of file
diff --git a/src/components/maps/overlay/MarkerCreator.vue b/src/components/maps/overlay/MarkerCreator.vue
index 89e27cb9..4b22fdf4 100644
--- a/src/components/maps/overlay/MarkerCreator.vue
+++ b/src/components/maps/overlay/MarkerCreator.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import type { MapMarker } from '@/types/Leaflet';
 import { onClickOutside, onLongPress, useCssVar, useFocus, useLocalStorage, useMouse, useTimeout, useTimeoutFn } from '@vueuse/core'
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 
@@ -87,6 +88,20 @@ function updateCSSVars() {
 const markerTitle = ref<string>()
 const markerTitleInput = ref<HTMLInputElement>()
 
+const markerTitleInputError = ref<Error | null>()
+
+// Data from localStorage
+const customMarkersData = useLocalStorage('custom-markers', [])
+
+// Refresh from localStorage
+onMounted(() => {
+    customMarkersData.value = useLocalStorage('custom-markers', []).value
+
+    document.addEventListener('refresh-custom-markers', () => {
+        customMarkersData.value = useLocalStorage('custom-markers', []).value
+    })
+})
+
 const addCustomMarker = ref<HTMLButtonElement>();
 
 const markerModal = ref<HTMLDialogElement>()
@@ -108,8 +123,18 @@ onClickOutside(markerMenu, handleClickOutside, { ignore: [markerModal] })
  * Add Custom Marker
  */
 function handleAddCustomMarker() {
+    // If title is empty, don't add anything
     if (!markerTitle.value) return
 
+    // If marker of the same name already exists, don't add anything
+    if (
+        customMarkersData.value.find((cm: MapMarker) => cm.title === markerTitle.value)
+    ) {
+        setTitleError(new Error('Ce titre est déjà utilisé par un marqueur !'))
+        return
+    }
+
+
     const addCustomMarkerEvent = new CustomEvent(
         `add-custom-marker`,
         {
@@ -124,6 +149,7 @@ function handleAddCustomMarker() {
     switchMenuMode('default')
 
     markerTitle.value = ""
+    setTitleError(null)
 }
 
 /**
@@ -152,6 +178,13 @@ function hideMarkerModal() {
     markerModal.value?.close()
     markerModalOpen.value = false
     switchMenuMode('default')
+
+    markerTitle.value = ""
+    setTitleError(null)
+}
+
+function setTitleError(error: Error | null) {
+    markerTitleInputError.value = error
 }
 </script>
 
@@ -187,6 +220,10 @@ function hideMarkerModal() {
 
                         <div class="form-input">
                             <input ref="markerTitleInput" type="text" name="marker-name" id="marker-name" v-model="markerTitle">
+
+                            <div class="form-error" v-if="markerTitleInputError">
+                                {{ markerTitleInputError.message }}
+                            </div>
                         </div>
                     </div>
                 </div>
diff --git a/src/components/maps/overlay/SearchMarkers.vue b/src/components/maps/overlay/SearchMarkers.vue
index ff05fbf4..d9b34462 100644
--- a/src/components/maps/overlay/SearchMarkers.vue
+++ b/src/components/maps/overlay/SearchMarkers.vue
@@ -170,8 +170,6 @@ function resetAllFields(actionAfter?: "focusAfter") {
 
 /**
  * CUSTOM MARKERS HANDLING
- * This is really dirty (to me at least)
- * It should probably be handled by a store system, but nanostores doesn't mesh well 
  */
 onMounted(() => {
     customMarkersData.value = useLocalStorage('custom-markers', []).value