diff --git a/src/components/Selector.vue b/src/components/Selector.vue
index 9643958..a7f2862 100644
--- a/src/components/Selector.vue
+++ b/src/components/Selector.vue
@@ -61,7 +61,7 @@
 </template>
 
 <script setup>
-import { onBeforeMount, ref, watch } from 'vue';
+import { onBeforeMount, ref, watch, nextTick } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useDialogStore } from '../stores/dialog';
 
@@ -69,31 +69,54 @@ import { useDialogStore } from '../stores/dialog';
 const { items, label, isCompareModeEnabled, index } = defineProps({
   label: String,
   items: Array,
-  isCompareModeEnabled: {
-    type: Boolean,
-    default: false,
-  },
+  isCompareModeEnabled: { type: Boolean, default: false },
   index: Number,
 });
 
-// Variables
+// Local state
 const currentValue = ref(null);
+const syncing = ref(false); // empêche les réactions pendant les mises à jour programmatiques
 
-// Stores
+// Store
 const { activeTracks } = storeToRefs(useDialogStore());
 
-// Hooks
+// Utils
+function isSame(a, b) {
+  if (!a || !b) return false;
+  if (a.slug && b.slug) return a.slug === b.slug;
+  return a.title === b.title;
+}
+
+function toVariation(v) {
+  if (!v) return null;
+  return Array.isArray(v) ? v[v.length - 1] || null : v;
+}
+
+// Initialisation : remplir le 1er select localement ET initialiser le store
 onBeforeMount(() => {
+  syncing.value = true;
+
   if (index === 0) {
-    currentValue.value = items[0];
+    currentValue.value = items[0] || null;
+    // si le store est vide, initialiser avec la variation du premier sélecteur
+    if (!activeTracks.value || activeTracks.value.length === 0) {
+      const v = toVariation(items[0]);
+      if (v) activeTracks.value = [v];
+    }
+  } else {
+    // les autres ne forcent pas le store ; leur currentValue restera à null
+    currentValue.value = null;
   }
+
+  nextTick(() => (syncing.value = false));
 });
 
-// Watchers
+// Quand on bascule compare mode (objet <-> tableau)
 watch(
   () => isCompareModeEnabled,
-  (newValue) => {
-    if (newValue) {
+  (flag) => {
+    syncing.value = true;
+    if (flag) {
       if (currentValue.value && !Array.isArray(currentValue.value)) {
         currentValue.value = [currentValue.value];
       }
@@ -102,80 +125,107 @@ watch(
         currentValue.value = currentValue.value[0] || null;
       }
     }
+    nextTick(() => (syncing.value = false));
   }
 );
 
-watch(currentValue, (newValue) => {
-  if (
-    newValue !== null &&
-    (Array.isArray(newValue) ? newValue.length > 0 : true)
-  ) {
-    selectTrack(newValue);
-  }
-});
-
+// Détection ajout / suppression dans le MultiSelect (côté composant)
+// On n'agit que si l'ajout/suppression concerne une variation appartenant à `items`
 watch(
-  activeTracks,
-  (newValue) => {
-    if (!isCompareModeEnabled || !currentValue.value) return;
+  currentValue,
+  (newVal, oldVal) => {
+    if (syncing.value) return;
 
-    currentValue.value.forEach((item) => {
-      if (!newValue.includes(item)) {
-        currentValue.value = currentValue.value.filter((el) => el !== item);
-      }
-    });
+    const newItems = Array.isArray(newVal) ? newVal : newVal ? [newVal] : [];
+    const oldItems = Array.isArray(oldVal) ? oldVal : oldVal ? [oldVal] : [];
+
+    const added = newItems.find((n) => !oldItems.some((o) => isSame(o, n)));
+    const removed = oldItems.find((o) => !newItems.some((n) => isSame(n, o)));
+
+    if (added && items.some((it) => isSame(it, added))) {
+      selectTrack(added, 'add');
+    } else if (removed && items.some((it) => isSame(it, removed))) {
+      selectTrack(removed, 'remove');
+    }
   },
   { deep: true }
 );
 
-function selectTrack(track) {
-  if (!isCompareModeEnabled) {
-    activeTracks.value = [track];
-    return;
-  }
+// Quand activeTracks change elsewhere -> synchroniser l'affichage local
+// Mais n'adopter que les variations qui appartiennent à ce Selector (`items`)
+watch(
+  activeTracks,
+  (newVal) => {
+    syncing.value = true;
 
-  const lastVariation = track[track.length - 1];
+    const storeList = Array.isArray(newVal) ? newVal : [];
+    // ne garder que les variations du store qui sont dans `items`
+    const matched = storeList.filter((av) =>
+      items.some((it) => isSame(it, av))
+    );
 
-  if (
-    activeTracks.value.length === 1 &&
-    !activeTracks.value.includes(lastVariation)
-  ) {
-    activeTracks.value.push(lastVariation);
-    return;
-  }
-
-  if (activeTracks.value.length === 2) {
-    if (activeTracks.value.includes(lastVariation)) {
-      removeTrack(track);
+    if (isCompareModeEnabled) {
+      currentValue.value = matched.length ? [...matched] : [];
     } else {
-      activeTracks.value.pop();
-      activeTracks.value.push(lastVariation);
+      currentValue.value = matched[0] || null;
     }
+
+    nextTick(() => (syncing.value = false));
+  },
+  { deep: true }
+);
+
+// Logique centrale de sélection (ajout / suppression)
+// Règles :
+// - mode normal -> activeTracks = [variation]
+// - mode comparaison -> conserver activeTracks[0] si possible; second élément ajouté/remplacé; suppression gère le cas de la suppression de la première
+function selectTrack(track, action = 'add') {
+  const variation = toVariation(track);
+  if (!variation) return;
+
+  if (!isCompareModeEnabled) {
+    activeTracks.value = [variation];
+    return;
+  }
+
+  if (action === 'remove') {
+    const wasFirst =
+      activeTracks.value.length && isSame(activeTracks.value[0], variation);
+    activeTracks.value = activeTracks.value.filter(
+      (t) => !isSame(t, variation)
+    );
+
+    // si on a retiré la première et qu'il reste une piste, elle devient naturellement index 0
+    // pas d'action supplémentaire nécessaire ici (déjà assuré par le filter)
+    return;
+  }
+
+  // action === 'add'
+  if (activeTracks.value.some((t) => isSame(t, variation))) {
+    // déjà présent -> ignore
+    return;
+  }
+
+  if (activeTracks.value.length === 0) {
+    activeTracks.value = [variation];
+  } else if (activeTracks.value.length === 1) {
+    activeTracks.value = [activeTracks.value[0], variation];
+  } else {
+    // remplacer le 2e
+    activeTracks.value = [activeTracks.value[0], variation];
   }
 }
 
-function removeTrack(track) {
-  activeTracks.value = activeTracks.value.filter(
-    (activeTrack) => activeTrack.title !== track.title
-  );
-}
-
-watch(activeTracks, (newValue) => {
-  if (newValue[newValue.length - 1] !== currentValue.value) {
-    currentValue.value = isCompareModeEnabled ? [] : null;
-  }
-});
-
-// Functions
+// Helpers pour affichage (inchangés)
 function getFrontViewUrl(item) {
   if (!item) return '';
   if (Array.isArray(item)) {
     return item.length > 0 ? getFrontViewUrl(item[0]) : '';
   }
-  if (item.files.length > 1) {
+  if (item.files && item.files.length > 1) {
     return item.files[7]?.url || item.files[0].url;
   } else {
-    return item.files[0].url;
+    return item.files && item.files[0] ? item.files[0].url : '';
   }
 }
 </script>