diff --git a/SoundSwitch.Common/Framework/Audio/Collection/DeviceReadOnlyCollection.cs b/SoundSwitch.Common/Framework/Audio/Collection/DeviceReadOnlyCollection.cs
new file mode 100644
index 0000000000..ccce0e5830
--- /dev/null
+++ b/SoundSwitch.Common/Framework/Audio/Collection/DeviceReadOnlyCollection.cs
@@ -0,0 +1,65 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using SoundSwitch.Common.Framework.Audio.Device;
+
+namespace SoundSwitch.Common.Framework.Audio.Collection
+{
+    public class DeviceReadOnlyCollection<T> : IReadOnlyCollection<T> where T : DeviceInfo
+    {
+        private readonly Dictionary<string, T> _byId = new();
+        private readonly Dictionary<string, T> _byName = new();
+
+        public DeviceReadOnlyCollection(IEnumerable<T> deviceInfos)
+        {
+            foreach (var item in deviceInfos)
+            {
+                if (item == null)
+                {
+                    return;
+                }
+
+                _byId[item.Id] = item;
+                _byName[item.NameClean] = item;
+            }
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            return _byId.Values.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        /// <summary>
+        /// Intersect with another list of <see cref="DeviceInfo"/>
+        /// </summary>
+        /// <param name="second"></param>
+        /// <returns></returns>
+        public IEnumerable<T> IntersectWith(IEnumerable<DeviceInfo> second)
+        {
+            return second
+                   .Select(info =>
+                   {
+                       if (_byId.TryGetValue(info.Id, out var found))
+                       {
+                           return found;
+                       }
+
+                       if (_byId.TryGetValue(info.NameClean, out found))
+                       {
+                           return found;
+                       }
+
+                       return null;
+                   })
+                   .Where(info => info != null)
+                   .Distinct();
+        }
+
+        public int Count => _byId.Count;
+    }
+}
\ No newline at end of file
diff --git a/SoundSwitch/Framework/Audio/Lister/CachedAudioDeviceLister.cs b/SoundSwitch/Framework/Audio/Lister/CachedAudioDeviceLister.cs
index 794a5822de..8537902eef 100644
--- a/SoundSwitch/Framework/Audio/Lister/CachedAudioDeviceLister.cs
+++ b/SoundSwitch/Framework/Audio/Lister/CachedAudioDeviceLister.cs
@@ -17,6 +17,7 @@
 using System.Linq;
 using NAudio.CoreAudioApi;
 using Serilog;
+using SoundSwitch.Common.Framework.Audio.Collection;
 using SoundSwitch.Common.Framework.Audio.Device;
 using SoundSwitch.Framework.NotificationManager;
 using SoundSwitch.Model;
@@ -27,10 +28,10 @@ namespace SoundSwitch.Framework.Audio.Lister
     public class CachedAudioDeviceLister : IAudioDeviceLister
     {
         /// <inheritdoc />
-        public IReadOnlyCollection<DeviceFullInfo> PlaybackDevices { get; private set; } = new DeviceFullInfo[0];
+        public DeviceReadOnlyCollection<DeviceFullInfo> PlaybackDevices { get; private set; } = new(Enumerable.Empty<DeviceFullInfo>());
 
         /// <inheritdoc />
-        public IReadOnlyCollection<DeviceFullInfo> RecordingDevices { get; private set; } = new DeviceFullInfo[0];
+        public DeviceReadOnlyCollection<DeviceFullInfo> RecordingDevices { get; private set; } = new(Enumerable.Empty<DeviceFullInfo>());
 
         private readonly DeviceState _state;
         private readonly DebounceDispatcher _dispatcher = new();
@@ -86,8 +87,8 @@ public void Refresh()
                     }
                 }
 
-                PlaybackDevices = playbackDevices.Values.ToArray();
-                RecordingDevices = recordingDevices.Values.ToArray();
+                PlaybackDevices = new DeviceReadOnlyCollection<DeviceFullInfo>(playbackDevices.Values);
+                RecordingDevices = new DeviceReadOnlyCollection<DeviceFullInfo>(recordingDevices.Values);
 
 
                 Log.Information("[{@State}] Refreshed all devices. {@Recording}/rec, {@Playback}/play", _state, recordingDevices.Count, playbackDevices.Count);
diff --git a/SoundSwitch/Model/AppModel.cs b/SoundSwitch/Model/AppModel.cs
index 477447c033..054405eb24 100644
--- a/SoundSwitch/Model/AppModel.cs
+++ b/SoundSwitch/Model/AppModel.cs
@@ -39,7 +39,6 @@
 using SoundSwitch.Localization;
 using SoundSwitch.Localization.Factory;
 using SoundSwitch.UI.Component;
-using SoundSwitch.Util.Extension;
 using SoundSwitch.Util.Timer;
 
 namespace SoundSwitch.Model
@@ -124,9 +123,9 @@ public bool IncludeBetaVersions
 
         public IEnumerable<DeviceInfo> SelectedDevices => AppConfigs.Configuration.SelectedDevices.OrderBy(info => info.DiscoveredAt);
 
-        public IEnumerable<DeviceInfo> AvailablePlaybackDevices => SelectedDevices.IntersectInverse(ActiveAudioDeviceLister.PlaybackDevices);
+        public IEnumerable<DeviceInfo> AvailablePlaybackDevices => ActiveAudioDeviceLister.PlaybackDevices.IntersectWith(SelectedDevices);
 
-        public IEnumerable<DeviceInfo> AvailableRecordingDevices => SelectedDevices.IntersectInverse(ActiveAudioDeviceLister.RecordingDevices);
+        public IEnumerable<DeviceInfo> AvailableRecordingDevices => ActiveAudioDeviceLister.RecordingDevices.IntersectWith(SelectedDevices);
 
         public bool SetCommunications
         {
@@ -354,8 +353,8 @@ public bool UnselectDevice(DeviceFullInfo device)
             bool result;
             try
             {
-                var list =  AppConfigs.Configuration.SelectedDevices.Where(device.Equals).ToArray();
-                result = list.Aggregate(true, (b, info) => b &  AppConfigs.Configuration.SelectedDevices.Remove(info));
+                var list = AppConfigs.Configuration.SelectedDevices.Where(device.Equals).ToArray();
+                result = list.Aggregate(true, (b, info) => b & AppConfigs.Configuration.SelectedDevices.Remove(info));
             }
             catch (ArgumentException)
             {
diff --git a/SoundSwitch/Model/IAudioDeviceLister.cs b/SoundSwitch/Model/IAudioDeviceLister.cs
index 469de9a9da..277ebd959f 100644
--- a/SoundSwitch/Model/IAudioDeviceLister.cs
+++ b/SoundSwitch/Model/IAudioDeviceLister.cs
@@ -13,9 +13,7 @@
 ********************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using NAudio.CoreAudioApi;
+using SoundSwitch.Common.Framework.Audio.Collection;
 using SoundSwitch.Common.Framework.Audio.Device;
 
 namespace SoundSwitch.Model
@@ -26,13 +24,13 @@ public interface IAudioDeviceLister : IDisposable
         ///     Get the playback device in the set state
         /// </summary>
         /// <returns></returns>
-        IReadOnlyCollection<DeviceFullInfo> PlaybackDevices { get; }
+        DeviceReadOnlyCollection<DeviceFullInfo> PlaybackDevices { get; }
 
         /// <summary>
         ///     Get the recording device in the set state
         /// </summary>
         /// <returns></returns>
-        IReadOnlyCollection<DeviceFullInfo> RecordingDevices { get; }
+        DeviceReadOnlyCollection<DeviceFullInfo> RecordingDevices { get; }
 
         void Refresh();
     }
diff --git a/SoundSwitch/UI/Forms/Settings.cs b/SoundSwitch/UI/Forms/Settings.cs
index 26ff5c40cd..cf22eda941 100644
--- a/SoundSwitch/UI/Forms/Settings.cs
+++ b/SoundSwitch/UI/Forms/Settings.cs
@@ -209,7 +209,7 @@ public void RefreshProfiles()
         {
             ListViewItem ProfileToListViewItem(Profile profile)
             {
-                var listViewItem = new ListViewItem(profile.Name) { Tag = profile };
+                var listViewItem = new ListViewItem(profile.Name) {Tag = profile};
                 Icon appIcon = null;
                 DeviceFullInfo recording = null;
                 DeviceFullInfo playback = null;
@@ -284,10 +284,8 @@ ListViewItem ProfileToListViewItem(Profile profile)
         private void PopulateAudioDevices()
         {
             var selectedDevices = AppModel.Instance.SelectedDevices.ToArray();
-            PopulateAudioList(playbackListView, selectedDevices,
-                _audioDeviceLister.PlaybackDevices);
-            PopulateAudioList(recordingListView, selectedDevices,
-                _audioDeviceLister.RecordingDevices);
+            PopulateAudioList(playbackListView, selectedDevices, _audioDeviceLister.PlaybackDevices);
+            PopulateAudioList(recordingListView, selectedDevices, _audioDeviceLister.RecordingDevices);
         }
 
         private void LocalizeForm()
@@ -359,7 +357,7 @@ private void closeButton_Click(object sender, EventArgs e)
 
         private void tabControl_SelectedIndexChanged(object sender, EventArgs e)
         {
-            var tabControlSender = (TabControl)sender;
+            var tabControlSender = (TabControl) sender;
             if (tabControlSender.SelectedTab == playbackTabPage)
             {
                 SetHotkeysFieldsVisibility(true);
@@ -402,7 +400,7 @@ private void notificationComboBox_SelectedValueChanged(object sender, EventArgs
         {
             if (!_loaded)
                 return;
-            var value = (DisplayEnumObject<NotificationTypeEnum>)((ComboBox)sender).SelectedItem;
+            var value = (DisplayEnumObject<NotificationTypeEnum>) ((ComboBox) sender).SelectedItem;
 
             if (value == null)
                 return;
@@ -437,7 +435,7 @@ private void tooltipInfoComboBox_SelectedValueChanged(object sender, EventArgs e
         {
             if (!_loaded)
                 return;
-            var value = (DisplayEnumObject<TooltipInfoTypeEnum>)((ComboBox)sender).SelectedItem;
+            var value = (DisplayEnumObject<TooltipInfoTypeEnum>) ((ComboBox) sender).SelectedItem;
 
             if (value == null)
                 return;
@@ -450,7 +448,7 @@ private void cyclerComboBox_SelectedValueChanged(object sender, EventArgs e)
         {
             if (!_loaded)
                 return;
-            var value = (DisplayEnumObject<DeviceCyclerTypeEnum>)((ComboBox)sender).SelectedItem;
+            var value = (DisplayEnumObject<DeviceCyclerTypeEnum>) ((ComboBox) sender).SelectedItem;
 
             if (value == null)
                 return;
@@ -463,7 +461,7 @@ private void languageComboBox_SelectedIndexChanged(object sender, EventArgs e)
             if (!_loaded)
                 return;
 
-            var value = (DisplayEnumObject<Language>)((ComboBox)sender).SelectedItem;
+            var value = (DisplayEnumObject<Language>) ((ComboBox) sender).SelectedItem;
 
             if (value == null)
                 return;
@@ -543,8 +541,7 @@ private void betaVersionCheckbox_CheckedChanged(object sender, EventArgs e)
 
         #region Device List Playback
 
-        private void PopulateAudioList(ListView listView, IEnumerable<DeviceInfo> selectedDevices,
-            IEnumerable<DeviceFullInfo> audioDevices)
+        private void PopulateAudioList(ListView listView, IEnumerable<DeviceInfo> selectedDevices, IEnumerable<DeviceFullInfo> audioDevices)
         {
             try
             {
@@ -579,8 +576,7 @@ private void PopulateAudioList(ListView listView, IEnumerable<DeviceInfo> select
         /// <param name="selected"></param>
         /// <param name="listView"></param>
         /// <returns></returns>
-        private ListViewItem GenerateListViewItem(DeviceFullInfo device, IEnumerable<DeviceInfo> selected,
-            ListView listView)
+        private ListViewItem GenerateListViewItem(DeviceFullInfo device, IEnumerable<DeviceInfo> selected, ListView listView)
         {
             var listViewItem = new ListViewItem
             {
@@ -588,9 +584,8 @@ private ListViewItem GenerateListViewItem(DeviceFullInfo device, IEnumerable<Dev
                 ImageKey = device.IconPath,
                 Tag = device
             };
-            var selectedDevice = device;
-            var isSelected = selected.Contains(selectedDevice);
-            if (selectedDevice.State == DeviceState.Active && isSelected)
+            var isSelected = selected.Contains(device);
+            if (device.State == DeviceState.Active && isSelected)
             {
                 listViewItem.Group = listView.Groups["selectedGroup"];
             }
@@ -625,10 +620,10 @@ private void ListViewItemChecked(object sender, ItemCheckEventArgs e)
                 switch (e.NewValue)
                 {
                     case CheckState.Checked:
-                        AppModel.Instance.SelectDevice((DeviceFullInfo)((ListView)sender).Items[e.Index].Tag);
+                        AppModel.Instance.SelectDevice((DeviceFullInfo) ((ListView) sender).Items[e.Index].Tag);
                         break;
                     case CheckState.Unchecked:
-                        AppModel.Instance.UnselectDevice((DeviceFullInfo)((ListView)sender).Items[e.Index].Tag);
+                        AppModel.Instance.UnselectDevice((DeviceFullInfo) ((ListView) sender).Items[e.Index].Tag);
                         break;
                     default:
                         throw new ArgumentOutOfRangeException();
@@ -713,12 +708,12 @@ private void iconChangeChoicesComboBox_SelectedIndexChanged(object sender, Event
         {
             if (!_loaded)
                 return;
-            var comboBox = (ComboBox)sender;
+            var comboBox = (ComboBox) sender;
 
             if (comboBox == null)
                 return;
 
-            var item = (DisplayEnumObject<IconChangerFactory.ActionEnum>)iconChangeChoicesComboBox.SelectedItem;
+            var item = (DisplayEnumObject<IconChangerFactory.ActionEnum>) iconChangeChoicesComboBox.SelectedItem;
             AppConfigs.Configuration.SwitchIcon = item.Enum;
             AppConfigs.Configuration.Save();
 
@@ -745,7 +740,7 @@ private void deleteProfileButton_Click(object sender, EventArgs e)
             }
 
             var profiles = profilesListView.SelectedItems.Cast<ListViewItem>()
-                .Select(item => (Profile)item.Tag);
+                                           .Select(item => (Profile) item.Tag);
             AppModel.Instance.ProfileManager.DeleteProfiles(profiles);
             deleteProfileButton.Enabled = false;
             editProfileButton.Enabled = false;
@@ -755,7 +750,7 @@ private void deleteProfileButton_Click(object sender, EventArgs e)
         private void hotKeyControl_HotKeyChanged(object sender, HotKeyTextBox.Event e)
         {
             var control = (HotKeyTextBox) sender;
-            var tuple = (Tuple<HotKeyAction, HotKey>)control.Tag;
+            var tuple = (Tuple<HotKeyAction, HotKey>) control.Tag;
             if (tuple == null)
                 return;
 
@@ -772,7 +767,7 @@ private void editProfileButton_Click(object sender, EventArgs e)
                 return;
             }
 
-            var profile = (Profile)profilesListView.SelectedItems[0].Tag;
+            var profile = (Profile) profilesListView.SelectedItems[0].Tag;
             var form = new UpsertProfileExtended(profile, _audioDeviceLister.PlaybackDevices, _audioDeviceLister.RecordingDevices, this, true);
             form.Show(this);
         }
diff --git a/SoundSwitch/Util/Extension/EnumerableExtension.cs b/SoundSwitch/Util/Extension/EnumerableExtension.cs
deleted file mode 100644
index c6e76435d4..0000000000
--- a/SoundSwitch/Util/Extension/EnumerableExtension.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace SoundSwitch.Util.Extension
-{
-    public static class EnumerableExtension
-    {
-        public static IEnumerable<TSource> IntersectInverse<TSource>(this IEnumerable<TSource> first, IEnumerable<TSource> second)
-        {
-
-            return IntersectIteratorInverse(first, second, null);
-        }
-
-        public static IEnumerable<TSource> IntersectInverse<TSource>(this IEnumerable<TSource> first, IEnumerable<TSource> second, IEqualityComparer<TSource>? comparer)
-        {
-
-            return IntersectIteratorInverse(first, second, comparer);
-        }
-
-        private static IEnumerable<TSource> IntersectIteratorInverse<TSource>(IEnumerable<TSource> first, IEnumerable<TSource> second, IEqualityComparer<TSource>? comparer)
-        {
-            var set = second.ToDictionary(source => source, comparer);
-
-            foreach (var element in first)
-            {
-                if (set.TryGetValue(element, out var secondElement))
-                {
-                    yield return secondElement;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file