diff --git a/Controls/CustomListView.cs b/Controls/CustomListView.cs
index 60f782b..d47cb82 100644
--- a/Controls/CustomListView.cs
+++ b/Controls/CustomListView.cs
@@ -10,6 +10,7 @@ internal sealed class CustomListView : ListView
         public CustomListView()
         {
             DoubleBuffered = true;
+            Sorting = SortOrder.Ascending;
         }
 
         protected override void WndProc(ref Message m)
diff --git a/Forms/FormSwitcher.cs b/Forms/FormSwitcher.cs
index 5da03fe..a6c199a 100644
--- a/Forms/FormSwitcher.cs
+++ b/Forms/FormSwitcher.cs
@@ -125,7 +125,7 @@ private void DefaultChanged(string devID)
                         SetTrayIcons();
                         VolBar.RegisterDevice(RenderType);
                     }
-                    SetDeviceIcon(item.Index, item.Selected);
+                    SetDeviceIcon(item.ImageIndex, item.Selected);
                 }
             }
         }