diff --git a/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs b/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
index 75a9fb5..ff18508 100644
--- a/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
+++ b/DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
@@ -150,11 +150,7 @@ namespace DiscordChatExporter.Gui.ViewModels
                 var guildChannelMap = new Dictionary<Guild, IReadOnlyList<Channel>>();
                 await foreach (var guild in discord.GetUserGuildsAsync())
                 {
-                    var channels = await discord.GetGuildChannelsAsync(guild.Id);
-                    guildChannelMap[guild] = channels
-                        .OrderBy(c => c.Category)
-                        .ThenBy(c => c.Name)
-                        .ToArray();
+                    guildChannelMap[guild] = await discord.GetGuildChannelsAsync(guild.Id);
                 }
 
                 GuildChannelMap = guildChannelMap;
diff --git a/DiscordChatExporter.Gui/Views/RootView.xaml b/DiscordChatExporter.Gui/Views/RootView.xaml
index 7072d2c..fe1710b 100644
--- a/DiscordChatExporter.Gui/Views/RootView.xaml
+++ b/DiscordChatExporter.Gui/Views/RootView.xaml
@@ -31,6 +31,7 @@
             </CollectionViewSource.GroupDescriptions>
             <CollectionViewSource.SortDescriptions>
                 <componentModel:SortDescription Direction="Ascending" PropertyName="Category" />
+                <componentModel:SortDescription Direction="Ascending" PropertyName="Name" />
             </CollectionViewSource.SortDescriptions>
         </CollectionViewSource>
     </Window.Resources>