diff --git a/ivette/src/dome/renderer/text/editor.tsx b/ivette/src/dome/renderer/text/editor.tsx
index 7ca40b680eba78057fdd0ce13b21e378afbb86b0..c22c6f6835c3c25da112586ad6c17688a9b7242a 100644
--- a/ivette/src/dome/renderer/text/editor.tsx
+++ b/ivette/src/dome/renderer/text/editor.tsx
@@ -432,6 +432,18 @@ export function unfoldAll(view: View): void {
   if (view !== null) Language.unfoldAll(view);
 }
 
+function isVisible(view: View, line: number): boolean {
+  if (!view || view.state.doc.lines < line) return false;
+  const doc = view.state.doc;
+  const top = view.documentTop;
+  const rect = view.dom.getBoundingClientRect();
+  const topVisibleBlock = view.lineBlockAtHeight(rect.top - top);
+  const topVisibleLine = doc.lineAt(topVisibleBlock.to).number;
+  const bottomVisibleBlock = view.lineBlockAtHeight(rect.bottom - top);
+  const bottomVisibleLine = doc.lineAt(bottomVisibleBlock.from).number;
+  return (topVisibleLine < line && line < bottomVisibleLine);
+}
+
 // Move to the given line. The indexation starts at 1.
 export function selectLine(view: View, line: number, atTop: boolean): void {
   if (!view || view.state.doc.lines < line) return;
@@ -439,9 +451,10 @@ export function selectLine(view: View, line: number, atTop: boolean): void {
   const { from: here } = doc.lineAt(view.state.selection.main.from);
   const { from: goto } = doc.line(Math.max(line, 1));
   if (here === goto) return;
-  view.dispatch({ selection: { anchor: goto }, scrollIntoView: true });
-  if (!atTop) return;
-  const effects = EditorView.scrollIntoView(goto, { y: 'start', yMargin: 0 });
+  view.dispatch({ selection: { anchor: goto } });
+  if (isVisible(view, line)) return;
+  const verticalScroll = atTop ? 'start' : 'center';
+  const effects = EditorView.scrollIntoView(goto, { y: verticalScroll });
   view.dispatch({ effects });
 }
 
diff --git a/ivette/src/frama-c/kernel/ASTview.tsx b/ivette/src/frama-c/kernel/ASTview.tsx
index 112823a87b61d85c2852ee8e1c0fc134d3137ff5..94b20dc6b618d6fad7bce9e69253d085d64eec7b 100644
--- a/ivette/src/frama-c/kernel/ASTview.tsx
+++ b/ivette/src/frama-c/kernel/ASTview.tsx
@@ -217,7 +217,8 @@ function createMarkerScroller(): Editor.Extension {
     const markerRanges = ranges.get(marker) ?? [];
     if (markerRanges.length !== 1) return;
     const { from: anchor } = markerRanges[0];
-    view.dispatch({ selection: { anchor }, scrollIntoView: true });
+    const line = view.state.doc.lineAt(anchor).number;
+    Editor.selectLine(view, line, false);
   });
 }