diff --git a/src/components/comments/Comment.vue b/src/components/comments/Comment.vue
index 9771853..a50b0bf 100644
--- a/src/components/comments/Comment.vue
+++ b/src/components/comments/Comment.vue
@@ -3,7 +3,10 @@
     :id="`comment-${comment.id}`"
     class="comment | flow"
     :data-status="getStatus"
-    @click="read()"
+    @click="handleClick()"
+    @mouseenter="hightlightCorrespondingMarker()"
+    @mouseleave="unhightlightCorrespondingMarker()"
+    ref="comment-node"
   >
     <header>
       <p>
@@ -80,7 +83,7 @@ import "dayjs/locale/fr";
 import { useUserStore } from "../../stores/user";
 import { useApiStore } from "../../stores/api";
 import { useDialogStore } from "../../stores/dialog";
-import { computed, ref } from "vue";
+import { computed, onMounted, ref, useTemplateRef } from "vue";
 import { storeToRefs } from "pinia";
 
 dayjs.locale("fr");
@@ -95,9 +98,11 @@ const emits = defineEmits(["update:file", "close:comment"]);
 const userStore = useUserStore();
 const api = useApiStore();
 const dialog = useDialogStore();
-const { activeTracks } = storeToRefs(useDialogStore());
+const { activeTracks, openedComment } = storeToRefs(useDialogStore());
 const draftText = ref(comment.text);
 const editField = ref(null);
+const commentNode = useTemplateRef("comment-node");
+let correspondingMarker = null;
 
 //  Functions
 const getStatus = computed(() => {
@@ -130,6 +135,11 @@ function closeAddField() {
   newCommentText.value = "";
 }
 
+function handleClick() {
+  read();
+  scrollTo();
+}
+
 async function read() {
   if (getStatus.value !== "unread") return;
   try {
@@ -141,13 +151,21 @@ async function read() {
   }
 }
 
+function scrollTo() {
+  const correspondingMarker = document.querySelector(
+    `.comment-marker[href="#comment-${comment.id}"]`
+  );
+  if (!correspondingMarker) return;
+  correspondingMarker.scrollIntoView();
+}
+
 async function deleteComment(event) {
   event.stopPropagation();
   const newFile = await api.deleteComment(comment);
 
-  // If there is an active track,
-  // it's not the opened file that should be updated
-  // but the corresponding file in the active track
+  // If there is an active track, we are not in PDF mode with a single file.
+  // Thus, it's not the opened file that should be updated
+  // but the corresponding file in the active track.
   if (activeTracks.value?.length > 0) {
     activeTracks.value[0].files = activeTracks.value[0].files.map((file) => {
       if (file.uuid !== newFile.uuid) return file;
@@ -181,6 +199,32 @@ function editComment(event) {
     editField.value.focus();
   }, 100);
 }
+
+function hightlightCorrespondingMarker() {
+  if (comment.type === "comment-reply") return;
+
+  const correspondingMarker = document.querySelector(
+    `.comment-marker[href="#comment-${comment.id}"]`
+  );
+  if (!correspondingMarker) return;
+
+  commentNode.value.classList.add("highlight");
+  correspondingMarker.classList.add("active");
+  correspondingMarker.classList.add("big");
+}
+function unhightlightCorrespondingMarker() {
+  if (comment.type === "comment-reply") return;
+
+  const correspondingMarker = document.querySelector(
+    `.comment-marker[href="#comment-${comment.id}"]`
+  );
+  if (!correspondingMarker) return;
+  if (openedComment.value) return;
+
+  commentNode.value.classList.remove("highlight");
+  correspondingMarker.classList.remove("active");
+  correspondingMarker.classList.remove("big");
+}
 </script>
 
 <style scoped>
diff --git a/src/components/comments/Comments.vue b/src/components/comments/Comments.vue
index 2f68b7d..5ca88a6 100644
--- a/src/components/comments/Comments.vue
+++ b/src/components/comments/Comments.vue
@@ -121,13 +121,10 @@ dayjs.locale("fr");
 const { user } = useUserStore();
 const { page } = usePageStore();
 const dialog = useDialogStore();
-const { comments, openedFile, draftComment, activeTracks } = storeToRefs(
-  useDialogStore()
-);
+const { comments, openedFile, openedComment, draftComment, activeTracks } =
+  storeToRefs(useDialogStore());
 const api = useApiStore();
 
-const openedComment = ref(null);
-
 const isAddOpen = ref(false);
 const route = useRoute();
 const waitingForCommentPosition = ref(false);
@@ -139,6 +136,10 @@ const sortedReplies = ref(null);
 
 watch(openedComment, (newVal) => {
   sortedReplies.value = newVal ? newVal.replies.slice().reverse() : null;
+
+  if (!newVal) {
+    unhighlightAllComments();
+  }
 });
 
 watch(isAddOpen, (newVal) => {
@@ -165,6 +166,13 @@ window.addEventListener("keydown", (event) => {
 });
 
 // Functions
+function unhighlightAllComments() {
+  document.querySelectorAll(".comment-marker.big").forEach((commentNode) => {
+    commentNode.classList.remove("big");
+    commentNode.classList.remove("active");
+  });
+}
+
 function handleSubmit(event = null) {
   if (event) {
     event.preventDefault();
@@ -427,6 +435,7 @@ function openComment(comment) {
   width: var(--marker-size);
   height: var(--marker-size);
   background: var(--icon-comment-default) no-repeat center / contain;
+  scroll-margin-block-start: 4rem;
   cursor: pointer !important;
   z-index: 999;
   overflow: visible;
@@ -435,7 +444,8 @@ function openComment(comment) {
   margin-left: calc(var(--marker-size) * -0.025);
   margin-top: calc(var(--marker-size) / -1.025);
 }
-.comment-marker:hover {
+.comment-marker:hover,
+.comment-marker.big {
   transform: scale(1.1);
 }
 .comment-marker.active,
diff --git a/src/stores/dialog.js b/src/stores/dialog.js
index 1b5abd9..30b3374 100644
--- a/src/stores/dialog.js
+++ b/src/stores/dialog.js
@@ -30,6 +30,7 @@ export const useDialogStore = defineStore("dialog", () => {
   const isCommentsOpen = ref(
     route.query.hasOwnProperty("comments") ? true : false
   );
+  const openedComment = ref(null);
 
   const draftComment = ref({});
   watch(
@@ -84,10 +85,17 @@ export const useDialogStore = defineStore("dialog", () => {
       }
     }, 100);
   });
+
   function setCommentMarkers() {
     if (!comments.value) return;
     comments.value.forEach((comment) => {
+      const correspondingMarker = document.querySelector(
+        `.comment-marker[href="#comment-${comment.id}"]`
+      );
       if (comment.location.file.uuid !== openedFile.value.uuid) return;
+      if (comment.type === "comment-reply") return;
+      if (correspondingMarker) return;
+
       const bubble = document.createElement("a");
 
       bubble.classList.add("comment-marker");
@@ -109,17 +117,23 @@ export const useDialogStore = defineStore("dialog", () => {
             )
           : document.querySelector(".track");
 
-        container.appendChild(bubble);
-
-        setTimeout(() => {
-          bubble.addEventListener("mouseenter", () => highlight(comment));
-          bubble.addEventListener("mouseleave", () => unhighlight(comment));
-        }, 100);
+        try {
+          container.appendChild(bubble);
+          setTimeout(() => {
+            bubble.addEventListener("mouseenter", () => highlight(comment));
+            bubble.addEventListener("mouseleave", () => unhighlight(comment));
+          }, 100);
+        } catch (error) {
+          console.error(
+            `Impossible de monter la bulle du commentaire ${comment.id}. La page n°${comment.position.pageIndex} n'existe pas dans le DOM.`
+          );
+        }
       }, timeOut);
     });
   }
 
   function removeCommentMarkers() {
+    console.log("remove comment markers");
     document.querySelectorAll(".comment-marker").forEach((bubble) => {
       bubble.parentNode.removeChild(bubble);
     });
@@ -143,5 +157,6 @@ export const useDialogStore = defineStore("dialog", () => {
     isCommentsOpen,
     isCommentPanelEnabled,
     updateFile,
+    openedComment,
   };
 });