diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/virtual-row-dispatch.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/virtual-row-dispatch.tsx
index dbed069e22e..e35899266af 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/virtual-row-dispatch.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/virtual-row-dispatch.tsx
@@ -9,6 +9,7 @@ import { getWorkspaceStatus } from '../../workspace-status'
 import type { WorktreeGroupBy } from './groups'
 import {
   getVirtualRowTransform,
+  getWorktreeVirtualRowTransform,
   shouldUseHeaderTopSpacing,
   type RenderRow
 } from '../viewport/virtual-rows'
@@ -31,7 +32,6 @@ import {
   renderWorktreeSectionHeaderRow,
   type SectionHeaderRowContext
 } from '../headers/SectionHeader'
-import { getWorktreeVirtualRowTransform } from '../viewport/virtual-rows'
 import type { WorktreeRowDragState } from '../drag/row-state'
 
 export type WorktreeVirtualRowContext = {
diff --git a/src/renderer/src/components/sidebar/worktree-list/viewport/use-row-measurement.ts b/src/renderer/src/components/sidebar/worktree-list/viewport/use-row-measurement.ts
index 709bf05d85b..392f88625ce 100644
--- a/src/renderer/src/components/sidebar/worktree-list/viewport/use-row-measurement.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/viewport/use-row-measurement.ts
@@ -9,10 +9,10 @@ import {
   buildLineageRowRekeyMap,
   getActiveStickyIndexesForScroll,
   getRenderRowKey,
+  getVirtualRowKey,
   pruneStaleVirtualRowElementCache,
   type RenderRow
 } from './virtual-rows'
-import { getVirtualRowKey } from './virtual-rows'
 import { countRecordKeysByReference } from '../scroll/tuning'
 import type { WorktreeListVirtualizer } from './use-virtualizer'
 
diff --git a/src/renderer/src/components/sidebar/worktree-list/viewport/use-virtualizer.ts b/src/renderer/src/components/sidebar/worktree-list/viewport/use-virtualizer.ts
index ea41bcd83a3..52d6c17f54e 100644
--- a/src/renderer/src/components/sidebar/worktree-list/viewport/use-virtualizer.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/viewport/use-virtualizer.ts
@@ -10,11 +10,11 @@ import {
   extractWorktreeVirtualRowIndexes,
   getRenderRowKey,
   getStickyHeaderIndexes,
+  getVirtualRowIndex,
   WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP,
   type RenderRow
 } from './virtual-rows'
 import { WORKTREE_SIDEBAR_REVEAL_TOP_INSET } from '../../worktree-sidebar-reveal'
-import { getVirtualRowIndex } from './virtual-rows'
 import {
   shouldAdjustWorktreeSidebarMeasuredRowScroll,
   USER_SCROLL_MEASUREMENT_ADJUSTMENT_SUPPRESS_MS