diff --git a/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs b/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs
index 9b89662..822fff0 100644
--- a/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs
+++ b/src/ClaudeDo.Ui/ViewModels/TaskListViewModel.cs
@@ -24,7 +24,7 @@ public partial class TaskListViewModel : ViewModelBase
     public ObservableCollection<TaskItemViewModel> Tasks { get; } = new();
 
     [ObservableProperty] private TaskItemViewModel? _selectedTask;
-    [ObservableProperty] private string? _currentListId;
+    [ObservableProperty, NotifyCanExecuteChangedFor(nameof(AddTaskCommand))] private string? _currentListId;
 
     public event Action<TaskItemViewModel?>? SelectedTaskChanged;
 
@@ -69,7 +69,9 @@ public partial class TaskListViewModel : ViewModelBase
         }
     }
 
-    [RelayCommand]
+    private bool CanAddTask() => CurrentListId is not null;
+
+    [RelayCommand(CanExecute = nameof(CanAddTask))]
     private async Task AddTask()
     {
         if (CurrentListId is null) return;
diff --git a/src/ClaudeDo.Ui/Views/MainWindow.axaml b/src/ClaudeDo.Ui/Views/MainWindow.axaml
index b1723e0..884ee4a 100644
--- a/src/ClaudeDo.Ui/Views/MainWindow.axaml
+++ b/src/ClaudeDo.Ui/Views/MainWindow.axaml
@@ -31,7 +31,7 @@
                          Margin="4">
                     <ListBox.ItemTemplate>
                         <DataTemplate x:DataType="vm:ListItemViewModel">
-                            <StackPanel Margin="4,2" DoubleTapped="OnListItemDoubleTapped">
+                            <StackPanel Margin="4,2" DoubleTapped="OnListItemDoubleTapped" PointerPressed="OnListItemPointerPressed">
                                 <StackPanel.ContextFlyout>
                                     <MenuFlyout>
                                         <MenuItem Header="Edit"
diff --git a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
index 309b71a..90ef6a4 100644
--- a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
+++ b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
@@ -27,4 +27,14 @@ public partial class MainWindow : Window
             e.Handled = true;
         }
     }
+
+    private void OnListItemPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (e.GetCurrentPoint(null).Properties.PointerUpdateKind == PointerUpdateKind.RightButtonPressed
+            && sender is Control c && c.DataContext is ListItemViewModel item
+            && DataContext is MainWindowViewModel vm)
+        {
+            vm.SelectedList = item;
+        }
+    }
 }
diff --git a/src/ClaudeDo.Ui/Views/TaskListView.axaml b/src/ClaudeDo.Ui/Views/TaskListView.axaml
index cb5906c..2f57331 100644
--- a/src/ClaudeDo.Ui/Views/TaskListView.axaml
+++ b/src/ClaudeDo.Ui/Views/TaskListView.axaml
@@ -18,7 +18,7 @@
                  Margin="4">
             <ListBox.ItemTemplate>
                 <DataTemplate x:DataType="vm:TaskItemViewModel">
-                    <Grid ColumnDefinitions="*,Auto,Auto" Margin="4,2" DoubleTapped="OnTaskItemDoubleTapped">
+                    <Grid ColumnDefinitions="*,Auto,Auto" Margin="4,2" DoubleTapped="OnTaskItemDoubleTapped" PointerPressed="OnTaskItemPointerPressed">
                         <Grid.ContextFlyout>
                             <MenuFlyout>
                                 <MenuItem Header="Edit"
diff --git a/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs b/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
index 0dfd12e..27e5f82 100644
--- a/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
+++ b/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
@@ -20,4 +20,14 @@ public partial class TaskListView : UserControl
             e.Handled = true;
         }
     }
+
+    private void OnTaskItemPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (e.GetCurrentPoint(null).Properties.PointerUpdateKind == PointerUpdateKind.RightButtonPressed
+            && sender is Control c && c.DataContext is TaskItemViewModel item
+            && DataContext is TaskListViewModel vm)
+        {
+            vm.SelectedTask = item;
+        }
+    }
 }