diff --git a/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml b/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml
index a35a2a77..6339b0f0 100644
--- a/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml
+++ b/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml
@@ -142,7 +142,6 @@
                 <Border Grid.Column="1">
                     <TreeView
                         x:Name="AvailableChannelsTreeView"
-                        DoubleTapped="AvailableChannelsTreeView_OnDoubleTapped"
                         ItemsSource="{Binding AvailableChannels}"
                         SelectedItems="{Binding SelectedChannels}"
                         SelectionChanged="AvailableChannelsTreeView_OnSelectionChanged"
@@ -161,7 +160,8 @@
                                 <Grid
                                     Background="Transparent"
                                     Classes.category="{Binding Channel.IsCategory}"
-                                    ColumnDefinitions="Auto,*,Auto">
+                                    ColumnDefinitions="Auto,*,Auto"
+                                    DoubleTapped="ChannelGrid_OnDoubleTapped">
                                     <Grid.Styles>
                                         <Style Selector="Grid">
                                             <Style Selector="^:not(.category)">
diff --git a/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml.cs b/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml.cs
index 1325269f..9ee315ed 100644
--- a/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml.cs
+++ b/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml.cs
@@ -23,10 +23,9 @@ public partial class DashboardView : UserControl<DashboardViewModel>
         SelectionChangedEventArgs args
     ) => DataContext.PullChannelsCommand.Execute(null);
 
-    private void AvailableChannelsTreeView_OnDoubleTapped(object? sender, TappedEventArgs args)
+    private void ChannelGrid_OnDoubleTapped(object? sender, TappedEventArgs args)
     {
-        // Ensure the tap was on an actual channel item, not empty space in the tree
-        if (args.Source is not Control { DataContext: ChannelConnection channelConnection })
+        if (sender is not Control { DataContext: ChannelConnection channelConnection })
         {
             return;
         }