diff --git a/src/components/Equalizer.tsx b/src/components/Equalizer.tsx
index a554e78b..60dc8dbd 100644
--- a/src/components/Equalizer.tsx
+++ b/src/components/Equalizer.tsx
@@ -1,7 +1,7 @@
 import { useState, useRef, useEffect, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Save, Trash2, RotateCcw } from 'lucide-react';
-import CustomSelect from './CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 import { useEqStore, EQ_BANDS, BUILTIN_PRESETS } from '../store/eqStore';
 import { useThemeStore } from '../store/themeStore';
 import { drawCurve } from '../utils/audio/eqCurve';
diff --git a/src/components/deviceSync/DeviceSyncHeader.tsx b/src/components/deviceSync/DeviceSyncHeader.tsx
index 089c072d..ebb7531f 100644
--- a/src/components/deviceSync/DeviceSyncHeader.tsx
+++ b/src/components/deviceSync/DeviceSyncHeader.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import {
   AlertCircle, FolderOpen, HardDriveUpload, RefreshCw, Usb,
 } from 'lucide-react';
-import CustomSelect from '../CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 import type { RemovableDrive } from '../../utils/deviceSync/deviceSyncHelpers';
 import { formatBytes } from '../../utils/deviceSync/deviceSyncHelpers';
 import type { DeviceSyncSource } from '../../store/deviceSyncStore';
diff --git a/src/components/internetRadio/RadioToolbar.tsx b/src/components/internetRadio/RadioToolbar.tsx
index d9ce3333..e175b3b9 100644
--- a/src/components/internetRadio/RadioToolbar.tsx
+++ b/src/components/internetRadio/RadioToolbar.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import CustomSelect from '../CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 
 export type RadioSortBy = 'manual' | 'az' | 'za' | 'newest';
 
diff --git a/src/components/playlists/PlaylistsSmartEditor.tsx b/src/components/playlists/PlaylistsSmartEditor.tsx
index 33e3a1c9..88d6a384 100644
--- a/src/components/playlists/PlaylistsSmartEditor.tsx
+++ b/src/components/playlists/PlaylistsSmartEditor.tsx
@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Plus } from 'lucide-react';
 import StarRating from '../StarRating';
-import CustomSelect from '../CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 import {
   LIMIT_MAX, YEAR_MAX, YEAR_MIN, clampYear, defaultSmartFilters,
   type SmartFilters,
diff --git a/src/components/settings/SystemTab.tsx b/src/components/settings/SystemTab.tsx
index 2ad3b0ea..5b9654cf 100644
--- a/src/components/settings/SystemTab.tsx
+++ b/src/components/settings/SystemTab.tsx
@@ -12,7 +12,7 @@ import type { ClockFormat, LinuxWaylandTextRenderProfile, LoggingMode } from '..
 import { IS_LINUX } from '../../utils/platform';
 import { showToast } from '../../utils/ui/toast';
 import { AboutPsysonicBrandHeader } from '../AboutPsysonicLol';
-import CustomSelect from '../CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 import LicensesPanel from '../LicensesPanel';
 import SettingsSubSection from '../SettingsSubSection';
 import { SettingsGroup } from './SettingsGroup';
diff --git a/src/components/settings/ThemeStoreSection.tsx b/src/components/settings/ThemeStoreSection.tsx
index 7e901cd1..f1f6c11a 100644
--- a/src/components/settings/ThemeStoreSection.tsx
+++ b/src/components/settings/ThemeStoreSection.tsx
@@ -5,7 +5,7 @@ import { open as openUrl } from '@tauri-apps/plugin-shell';
 import CoverLightbox from '../CoverLightbox';
 import { useThemeAnimationRisk } from '../../hooks/useThemeAnimationRisk';
 import { AnimatedThemeBadge } from './AnimatedThemeBadge';
-import CustomSelect from '../CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 import { formatRelativeTime } from '../../utils/format/relativeTime';
 import { useThemeStore } from '../../store/themeStore';
 import { useInstalledThemesStore, type InstalledTheme } from '../../store/installedThemesStore';
diff --git a/src/components/settings/ThemesTab.tsx b/src/components/settings/ThemesTab.tsx
index e00d4758..1c22bf74 100644
--- a/src/components/settings/ThemesTab.tsx
+++ b/src/components/settings/ThemesTab.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { Clock, Palette, Store, Upload } from 'lucide-react';
 import { useThemeStore } from '../../store/themeStore';
 import { useInstalledThemesStore } from '../../store/installedThemesStore';
-import CustomSelect from '../CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 import BackToTopButton from '@/ui/BackToTopButton';
 import { FIXED_THEMES } from './fixedThemes';
 import { InstalledThemes } from './InstalledThemes';
diff --git a/src/components/settings/audio/AudioOutputDeviceSection.tsx b/src/components/settings/audio/AudioOutputDeviceSection.tsx
index d9998533..bd4f3455 100644
--- a/src/components/settings/audio/AudioOutputDeviceSection.tsx
+++ b/src/components/settings/audio/AudioOutputDeviceSection.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { invoke } from '@tauri-apps/api/core';
 import { AudioLines, RotateCcw } from 'lucide-react';
 import type { TFunction } from 'i18next';
-import CustomSelect from '../../CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 import SettingsSubSection from '../../SettingsSubSection';
 import { SettingsGroup } from '../SettingsGroup';
 import { SettingsToggle } from '../SettingsToggle';
diff --git a/src/components/settings/musicNetwork/EnrichmentPrimarySelect.tsx b/src/components/settings/musicNetwork/EnrichmentPrimarySelect.tsx
index 325736fe..d63a27ea 100644
--- a/src/components/settings/musicNetwork/EnrichmentPrimarySelect.tsx
+++ b/src/components/settings/musicNetwork/EnrichmentPrimarySelect.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import CustomSelect from '../../CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 import { SettingsGroup } from '../SettingsGroup';
 import type { Account } from '../../../music-network';
 
diff --git a/src/components/sidebar/perfProbe/SidebarPerfProbeLogsTab.tsx b/src/components/sidebar/perfProbe/SidebarPerfProbeLogsTab.tsx
index f639a295..13bbf43e 100644
--- a/src/components/sidebar/perfProbe/SidebarPerfProbeLogsTab.tsx
+++ b/src/components/sidebar/perfProbe/SidebarPerfProbeLogsTab.tsx
@@ -15,7 +15,7 @@ import { getLoggingMode, tailRuntimeLogs, type RuntimeLogLine } from '../../../a
 import { invoke } from '@tauri-apps/api/core';
 import { useAuthStore } from '../../../store/authStore';
 import type { LoggingMode } from '../../../store/authStoreTypes';
-import CustomSelect from '../../CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 import { filterLogLines } from '../../../utils/perf/filterLogLines';
 import { sanitizeLogLine } from '../../../utils/perf/sanitizeLogLine';
 
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index ec174196..6e5a0d67 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -13,7 +13,7 @@ import {
 import { syncServerHttpContextForProfile } from '../utils/server/syncServerHttpContext';
 import { useTranslation } from 'react-i18next';
 import i18n from '../i18n';
-import CustomSelect from '../components/CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 import {
   decodeServerMagicString,
   DECODED_PASSWORD_VISUAL_MASK,
diff --git a/src/pages/SearchBrowsePage.tsx b/src/pages/SearchBrowsePage.tsx
index 428ed770..a904e2ab 100644
--- a/src/pages/SearchBrowsePage.tsx
+++ b/src/pages/SearchBrowsePage.tsx
@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next';
 import AlbumRow from '../components/AlbumRow';
 import ArtistRow from '../components/ArtistRow';
 import PagedSongList from '../components/PagedSongList';
-import CustomSelect from '../components/CustomSelect';
+import CustomSelect from '@/ui/CustomSelect';
 import StarFilterButton from '../components/StarFilterButton';
 import { tooltipAttrs } from '@/ui/tooltipAttrs';
 import { APP_MAIN_SCROLL_VIEWPORT_ID } from '../constants/appScroll';
diff --git a/src/components/CustomSelect.tsx b/src/ui/CustomSelect.tsx
similarity index 100%
rename from src/components/CustomSelect.tsx
rename to src/ui/CustomSelect.tsx