diff --git a/src/web-ui/src/app/components/panels/base/FlexiblePanel.tsx b/src/web-ui/src/app/components/panels/base/FlexiblePanel.tsx
index 5fadd6a5..a15e21d9 100644
--- a/src/web-ui/src/app/components/panels/base/FlexiblePanel.tsx
+++ b/src/web-ui/src/app/components/panels/base/FlexiblePanel.tsx
@@ -476,6 +476,7 @@ const FlexiblePanel: React.FC<ExtendedFlexiblePanelProps> = memo(({
             jumpToLine={editorData.jumpToLine}
             jumpToColumn={editorData.jumpToColumn}
             jumpToRange={editorData.jumpToRange}
+            navigationToken={editorData.navigationToken}
             isActiveTab={isActive}
             onFileMissingFromDiskChange={onFileMissingFromDiskChange}
             onContentChange={(newContent, hasChanges) => {
diff --git a/src/web-ui/src/flow_chat/components/modern/ModernFlowChatContainer.tsx b/src/web-ui/src/flow_chat/components/modern/ModernFlowChatContainer.tsx
index 3031c27a..68de5084 100644
--- a/src/web-ui/src/flow_chat/components/modern/ModernFlowChatContainer.tsx
+++ b/src/web-ui/src/flow_chat/components/modern/ModernFlowChatContainer.tsx
@@ -47,7 +47,7 @@ export const ModernFlowChatContainer: React.FC<ModernFlowChatContainerProps> = (
   const autoPinnedSessionIdRef = useRef<string | null>(null);
   const virtualListRef = useRef<VirtualMessageListRef>(null);
   const { workspacePath } = useWorkspaceContext();
-  const { isBtwSession, btwOrigin, btwParentTitle } = useFlowChatSessionRelationship(activeSession);
+  const { btwOrigin, btwParentTitle } = useFlowChatSessionRelationship(activeSession);
   const {
     exploreGroupStates,
     onExploreGroupToggle: handleExploreGroupToggle,
diff --git a/src/web-ui/src/shared/services/FileTabManager.ts b/src/web-ui/src/shared/services/FileTabManager.ts
index 37872447..1b2bfb08 100644
--- a/src/web-ui/src/shared/services/FileTabManager.ts
+++ b/src/web-ui/src/shared/services/FileTabManager.ts
@@ -21,6 +21,8 @@ export interface FileTabOptions {
   jumpToColumn?: number;
    
   jumpToRange?: LineRange;
+  
+  navigationToken?: number;
    
   mode?: 'agent' | 'project';
    
@@ -60,6 +62,7 @@ class FileTabManager {
       jumpToLine,
       jumpToColumn,
       jumpToRange,
+      navigationToken,
       mode = 'agent',
       forceNew = false,
       splitView = false,
@@ -84,6 +87,7 @@ class FileTabManager {
       filePath: normalizedPath,
       fileName,
       workspacePath,
+      navigationToken: navigationToken ?? Date.now(),
       
       ...(finalJumpToRange && { jumpToRange: finalJumpToRange }),
       
diff --git a/src/web-ui/src/tools/editor/components/CodeEditor.tsx b/src/web-ui/src/tools/editor/components/CodeEditor.tsx
index 730b9334..0ec32b6c 100644
--- a/src/web-ui/src/tools/editor/components/CodeEditor.tsx
+++ b/src/web-ui/src/tools/editor/components/CodeEditor.tsx
@@ -82,6 +82,8 @@ export interface CodeEditorProps {
   jumpToColumn?: number;
   /** Jump to line range (preferred, supports single or multi-line selection) */
   jumpToRange?: import('@/component-library/components/Markdown').LineRange;
+  /** Unique token for repeated jump requests to the same location. */
+  navigationToken?: number;
   /** When false, disk sync polling is paused (e.g. background editor tab). */
   isActiveTab?: boolean;
   /** File path is not an existing file on disk (drives tab "deleted" label). */
@@ -137,6 +139,7 @@ const CodeEditor: React.FC<CodeEditorProps> = ({
   jumpToLine,
   jumpToColumn,
   jumpToRange,
+  navigationToken,
   isActiveTab = true,
   onFileMissingFromDiskChange,
 }) => {
@@ -1043,6 +1046,61 @@ const CodeEditor: React.FC<CodeEditorProps> = ({
     });
   }, []);
 
+  const isJumpStillApplied = useCallback((
+    editor: any,
+    model: any,
+    line: number,
+    column: number,
+    endLine?: number
+  ): boolean => {
+    const lineCount = model.getLineCount();
+    const targetLine = Math.min(line, Math.max(1, lineCount));
+    const targetEndLine = endLine ? Math.min(endLine, Math.max(1, lineCount)) : undefined;
+    const maxColumnForLine = model.getLineMaxColumn(targetLine);
+    const targetColumn = Math.min(Math.max(1, column), maxColumnForLine);
+    const requiredEndLine = targetEndLine ?? targetLine;
+    const visibleRanges = typeof editor.getVisibleRanges === 'function'
+      ? editor.getVisibleRanges()
+      : [];
+    const isTargetVisible = visibleRanges.some((range: monaco.Range) =>
+      range.startLineNumber <= targetLine && range.endLineNumber >= requiredEndLine
+    );
+
+    if (!isTargetVisible) {
+      return false;
+    }
+
+    const selection = typeof editor.getSelection === 'function' ? editor.getSelection() : null;
+
+    if (targetEndLine && targetEndLine > targetLine) {
+      if (!selection) {
+        return false;
+      }
+
+      const endLineMaxColumn = model.getLineMaxColumn(targetEndLine);
+      return (
+        selection.startLineNumber === targetLine &&
+        selection.startColumn === 1 &&
+        selection.endLineNumber === targetEndLine &&
+        selection.endColumn === endLineMaxColumn
+      );
+    }
+
+    const position = typeof editor.getPosition === 'function' ? editor.getPosition() : null;
+    if (!position || !selection) {
+      return false;
+    }
+
+    return (
+      position.lineNumber === targetLine &&
+      position.column === targetColumn &&
+      selection.startLineNumber === targetLine &&
+      selection.startColumn === targetColumn &&
+      selection.endLineNumber === targetLine &&
+      selection.endColumn === targetColumn
+    );
+  }, []);
+
   // Handle initial jump (after content load). If the model has fewer lines than requested,
   // wait for content to sync into the model; otherwise we clamp to line 1, set lastJump,
   // and dedupe blocks a correct jump after the real text arrives.
@@ -1064,7 +1122,8 @@ const CodeEditor: React.FC<CodeEditorProps> = ({
       lastJump &&
       lastJump.filePath === filePath &&
       lastJump.line === finalRange.start &&
-      lastJump.endLine === finalRange.end
+      lastJump.endLine === finalRange.end &&
+      isJumpStillApplied(editor, model, finalRange.start, targetColumn, finalRange.end)
     ) {
       return;
     }
@@ -1136,7 +1195,7 @@ const CodeEditor: React.FC<CodeEditorProps> = ({
         timeoutId = null;
       }
     };
-  }, [jumpToRange, jumpToLine, jumpToColumn, monacoReady, loading, content, filePath, performJump]);
+  }, [jumpToRange, jumpToLine, jumpToColumn, navigationToken, monacoReady, loading, content, filePath, performJump, isJumpStillApplied]);
 
   // Status bar popover: open and confirm
   const openStatusBarPopover = useCallback((type: 'position' | 'indent' | 'encoding' | 'language', e: React.MouseEvent) => {