diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed13389fb..09d974cb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
 * [person] accompanying course work: fix on-the-fly update of thirdParty 
 * [on-the-fly] close modal only after validation
 * [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433)
@@ -25,7 +26,6 @@ and this project adheres to
 ## Test releases
 
 ### test release 2021-02-01
->>>>>>> master
 
 * renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
 * renomme date de début en date d'ouverture dans le formulaire parcours
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 21f7a9c55..7b06776ba 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -160,7 +160,10 @@ export default {
       },
       badgeType() {
          return 'entity-' + this.type + ' badge-' + this.type;
-      }
+      },
+      getReturnPath() {
+         return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
+      },
    },
    methods: {
       closeModal() {
@@ -207,9 +210,9 @@ export default {
       buildLocation(id, type) {
          if (type === 'person') {
             // TODO i18n
-            return `/fr/person/${id}/general`;
+            return encodeURI(`/fr/person/${id}/general${this.getReturnPath}`);
          } else if (type === 'thirdparty') {
-            return `/fr/3party/3party/${id}/view`;
+            return encodeURI(`/fr/3party/3party/${id}/view${this.getReturnPath}`);
          }
       }
    }