diff --git a/src/frontend/src/features/pip/utils/pipTrackSelection.ts b/src/frontend/src/features/layout/utils/trackSelection.ts
similarity index 100%
rename from src/frontend/src/features/pip/utils/pipTrackSelection.ts
rename to src/frontend/src/features/layout/utils/trackSelection.ts
diff --git a/src/frontend/src/features/pip/components/layout/PipFocusLayout.tsx b/src/frontend/src/features/pip/components/layout/PipFocusLayout.tsx
index bbaab017..dccb5ae4 100644
--- a/src/frontend/src/features/pip/components/layout/PipFocusLayout.tsx
+++ b/src/frontend/src/features/pip/components/layout/PipFocusLayout.tsx
@@ -2,7 +2,7 @@ import { memo } from 'react'
 import type { TrackReferenceOrPlaceholder } from '@livekit/components-core'
 import { styled } from '@/styled-system/jsx'
 import { ParticipantTile } from '@/features/participantTile/components/ParticipantTile'
-import { getTrackKey } from '../../utils/pipTrackSelection'
+import { getTrackKey } from '@/features/layout/utils/trackSelection'
 
 type PipFocusLayoutProps = {
   mainTrack?: TrackReferenceOrPlaceholder
diff --git a/src/frontend/src/features/pip/components/layout/PipGridLayout.tsx b/src/frontend/src/features/pip/components/layout/PipGridLayout.tsx
index 20a9ef42..3f0cfc36 100644
--- a/src/frontend/src/features/pip/components/layout/PipGridLayout.tsx
+++ b/src/frontend/src/features/pip/components/layout/PipGridLayout.tsx
@@ -4,7 +4,7 @@ import { styled } from '@/styled-system/jsx'
 import { ParticipantTile } from '@/features/participantTile/components/ParticipantTile'
 import { usePipElementSize } from '../../hooks/usePipElementSize'
 import { computePipGridLayout } from '../../utils/pipGrid'
-import { getTrackKey } from '../../utils/pipTrackSelection'
+import { getTrackKey } from '@/features/layout/utils/trackSelection'
 
 type PipGridLayoutProps = {
   tracks: TrackReferenceOrPlaceholder[]
diff --git a/src/frontend/src/features/pip/components/layout/PipScreenShareLayout.tsx b/src/frontend/src/features/pip/components/layout/PipScreenShareLayout.tsx
index 8ba5c7c6..9eeb1a69 100644
--- a/src/frontend/src/features/pip/components/layout/PipScreenShareLayout.tsx
+++ b/src/frontend/src/features/pip/components/layout/PipScreenShareLayout.tsx
@@ -2,7 +2,7 @@ import { memo } from 'react'
 import type { TrackReferenceOrPlaceholder } from '@livekit/components-core'
 import { styled } from '@/styled-system/jsx'
 import { ParticipantTile } from '@/features/participantTile/components/ParticipantTile'
-import { getTrackKey } from '../../utils/pipTrackSelection'
+import { getTrackKey } from '@/features/layout/utils/trackSelection'
 
 type PipScreenShareLayoutProps = {
   screenShareTrack: TrackReferenceOrPlaceholder