diff --git a/src/ClaudeDo.Ui/Views/MainWindow.axaml b/src/ClaudeDo.Ui/Views/MainWindow.axaml
index 7018fed..76d4e42 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">
+                            <StackPanel Margin="4,2" DoubleTapped="OnListItemDoubleTapped">
                                 <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/>
                                 <TextBlock Text="{Binding WorkingDir}" FontSize="10" Foreground="Gray"
                                            IsVisible="{Binding WorkingDir, Converter={x:Static ObjectConverters.IsNotNull}}"/>
diff --git a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
index 648144c..e227cdf 100644
--- a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
+++ b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Input;
 using ClaudeDo.Ui.ViewModels;
 
 namespace ClaudeDo.Ui.Views;
@@ -16,4 +17,15 @@ public partial class MainWindow : Window
         if (DataContext is MainWindowViewModel vm)
             await vm.InitializeAsync();
     }
+
+    private void OnListItemDoubleTapped(object? sender, TappedEventArgs e)
+    {
+        if (sender is Control c && c.DataContext is ListItemViewModel item
+            && DataContext is MainWindowViewModel vm)
+        {
+            vm.SelectedList = item;
+            if (vm.EditListCommand.CanExecute(null))
+                vm.EditListCommand.Execute(null);
+        }
+    }
 }
diff --git a/src/ClaudeDo.Ui/Views/TaskListView.axaml b/src/ClaudeDo.Ui/Views/TaskListView.axaml
index b27674c..66a4ab7 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">
+                    <Grid ColumnDefinitions="*,Auto,Auto" Margin="4,2" DoubleTapped="OnTaskItemDoubleTapped">
                         <StackPanel Grid.Column="0">
                             <TextBlock Text="{Binding Title}" FontWeight="SemiBold"/>
                             <TextBlock Text="{Binding TagsText}" FontSize="10" Foreground="Gray"
diff --git a/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs b/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
index c0c6d56..d8bdda7 100644
--- a/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
+++ b/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
@@ -1,4 +1,6 @@
 using Avalonia.Controls;
+using Avalonia.Input;
+using ClaudeDo.Ui.ViewModels;
 
 namespace ClaudeDo.Ui.Views;
 
@@ -8,4 +10,15 @@ public partial class TaskListView : UserControl
     {
         InitializeComponent();
     }
+
+    private void OnTaskItemDoubleTapped(object? sender, TappedEventArgs e)
+    {
+        if (sender is Control c && c.DataContext is TaskItemViewModel item
+            && DataContext is TaskListViewModel vm)
+        {
+            vm.SelectedTask = item;
+            if (vm.EditTaskCommand.CanExecute(null))
+                vm.EditTaskCommand.Execute(null);
+        }
+    }
 }