diff --git a/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs b/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs
index 822fff0..8cf74e6 100644
--- a/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs
+++ b/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs
@@ -74,8 +74,6 @@ public partial class TaskListViewModel : ViewModelBase
     [RelayCommand(CanExecute = nameof(CanAddTask))]
     private async Task AddTask()
     {
-        if (CurrentListId is null) return;
-
         // Get list default commit type
         var list = await _listRepo.GetByIdAsync(CurrentListId);
         var defaultCommitType = list?.DefaultCommitType ?? "chore";
diff --git a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
index 90ef6a4..fcd8c80 100644
--- a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
+++ b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
@@ -35,6 +35,7 @@ public partial class MainWindow : Window
             && DataContext is MainWindowViewModel vm)
         {
             vm.SelectedList = item;
+            e.Handled = true;
         }
     }
 }
diff --git a/src/ClaudeDo.Ui/Views/TaskListView.axaml b/src/ClaudeDo.Ui/Views/TaskListView.axaml
index 2f57331..363c128 100644
--- a/src/ClaudeDo.Ui/Views/TaskListView.axaml
+++ b/src/ClaudeDo.Ui/Views/TaskListView.axaml
@@ -3,7 +3,8 @@
              xmlns:vm="using:ClaudeDo.Ui.ViewModels"
              xmlns:conv="using:ClaudeDo.Ui.Converters"
              x:Class="ClaudeDo.Ui.Views.TaskListView"
-             x:DataType="vm:TaskListViewModel">
+             x:DataType="vm:TaskListViewModel"
+             x:Name="Root">
     <DockPanel>
         <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="4">
             <TextBlock Text="Tasks" FontWeight="Bold" FontSize="14" VerticalAlignment="Center" Margin="4,0"/>
@@ -22,9 +23,9 @@
                         <Grid.ContextFlyout>
                             <MenuFlyout>
                                 <MenuItem Header="Edit"
-                                          Command="{Binding $parent[UserControl].((vm:TaskListViewModel)DataContext).EditTaskCommand}"/>
+                                          Command="{Binding #Root.((vm:TaskListViewModel)DataContext).EditTaskCommand}"/>
                                 <MenuItem Header="Delete"
-                                          Command="{Binding $parent[UserControl].((vm:TaskListViewModel)DataContext).DeleteTaskCommand}"/>
+                                          Command="{Binding #Root.((vm:TaskListViewModel)DataContext).DeleteTaskCommand}"/>
                                 <Separator/>
                                 <MenuItem Header="Run Now"
                                           Command="{Binding RunNowCommand}"/>
diff --git a/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs b/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
index 27e5f82..23c01e0 100644
--- a/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
+++ b/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
@@ -28,6 +28,7 @@ public partial class TaskListView : UserControl
             && DataContext is TaskListViewModel vm)
         {
             vm.SelectedTask = item;
+            e.Handled = true;
         }
     }
 }