diff --git a/config/scripts/ci-shard-timings.json b/config/scripts/ci-shard-timings.json
index 1f3ca647d6d..662d78985a8 100644
--- a/config/scripts/ci-shard-timings.json
+++ b/config/scripts/ci-shard-timings.json
@@ -8014,7 +8014,7 @@
       "src/renderer/src/components/settings/RepositoryIconPicker.github-avatar-refresh.test.tsx": 494,
       "src/renderer/src/components/settings/repository/RepositoryJiraProjectSection.test.tsx": 309,
       "src/renderer/src/components/settings/RepositoryPane.test.ts": 3208,
-      "src/renderer/src/components/settings/RepositoryPaneDraftInput.test.tsx": 318,
+      "src/renderer/src/components/settings/repository/RepositoryPaneDraftInput.test.tsx": 318,
       "src/renderer/src/components/settings/RepositorySourceControlAiSection.test.ts": 357,
       "src/renderer/src/components/settings/repository/execution/RepositoryWorktreeDefaultsSection.test.tsx": 415,
       "src/renderer/src/components/settings/RuntimeEnvironmentsPane.test.ts": 280,
diff --git a/src/renderer/src/components/settings/RepositoryPane.tsx b/src/renderer/src/components/settings/RepositoryPane.tsx
index e27af7d6115..f17ebb1a2f4 100644
--- a/src/renderer/src/components/settings/RepositoryPane.tsx
+++ b/src/renderer/src/components/settings/RepositoryPane.tsx
@@ -22,7 +22,7 @@ import { getRepositoryIconSectionId } from './repository-settings-targets'
 import { RepositoryIconPicker } from './repository/identity/RepositoryIconPicker'
 import { getRepositoryPaneSearchEntries } from './repository-search'
 import { RepositoryHostSetupsSection } from './RepositoryHostSetupsSection'
-import { RepoSettingsDraftInput } from './RepositorySettingsDraftInput'
+import { RepoSettingsDraftInput } from './repository/RepositorySettingsDraftInput'
 import { RepositoryForkSyncSection } from './repository/identity/RepositoryForkSyncSection'
 import { RepositoryGitHubAccountSection } from './RepositoryGitHubAccountSection'
 import { translate } from '@/i18n/i18n'
diff --git a/src/renderer/src/components/settings/RepositoryPaneDraftInput.test.tsx b/src/renderer/src/components/settings/repository/RepositoryPaneDraftInput.test.tsx
similarity index 100%
rename from src/renderer/src/components/settings/RepositoryPaneDraftInput.test.tsx
rename to src/renderer/src/components/settings/repository/RepositoryPaneDraftInput.test.tsx
diff --git a/src/renderer/src/components/settings/RepositorySettingsDraftInput.tsx b/src/renderer/src/components/settings/repository/RepositorySettingsDraftInput.tsx
similarity index 99%
rename from src/renderer/src/components/settings/RepositorySettingsDraftInput.tsx
rename to src/renderer/src/components/settings/repository/RepositorySettingsDraftInput.tsx
index 0f980348e84..3f3de477865 100644
--- a/src/renderer/src/components/settings/RepositorySettingsDraftInput.tsx
+++ b/src/renderer/src/components/settings/repository/RepositorySettingsDraftInput.tsx
@@ -1,6 +1,6 @@
 import type React from 'react'
 import { useEffect, useRef, useState } from 'react'
-import { Input } from '../ui/input'
+import { Input } from '../../ui/input'
 
 type RepoTextDraft = { repoId: string; text: string }
 
diff --git a/src/renderer/src/components/settings/repository/execution/RepositoryWorktreeDefaultsSection.tsx b/src/renderer/src/components/settings/repository/execution/RepositoryWorktreeDefaultsSection.tsx
index 1fe08f74ace..22ab670946a 100644
--- a/src/renderer/src/components/settings/repository/execution/RepositoryWorktreeDefaultsSection.tsx
+++ b/src/renderer/src/components/settings/repository/execution/RepositoryWorktreeDefaultsSection.tsx
@@ -4,7 +4,7 @@ import { Button } from '../../../ui/button'
 import { Label } from '../../../ui/label'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../../../ui/select'
 import { BaseRefPicker } from '../../BaseRefPicker'
-import { RepoSettingsDraftInput } from '../../RepositorySettingsDraftInput'
+import { RepoSettingsDraftInput } from '../RepositorySettingsDraftInput'
 import { SearchableSetting } from '../../SearchableSetting'
 import { translate } from '@/i18n/i18n'
 import { getRepoExecutionHostId } from '../../../../../../shared/execution-host'