diff --git a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
index e227cdf..309b71a 100644
--- a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
+++ b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
@@ -20,12 +20,11 @@ public partial class MainWindow : Window
 
     private void OnListItemDoubleTapped(object? sender, TappedEventArgs e)
     {
-        if (sender is Control c && c.DataContext is ListItemViewModel item
+        if (sender is Control c && c.DataContext is ListItemViewModel
             && DataContext is MainWindowViewModel vm)
         {
-            vm.SelectedList = item;
-            if (vm.EditListCommand.CanExecute(null))
-                vm.EditListCommand.Execute(null);
+            vm.EditListCommand.Execute(null);
+            e.Handled = true;
         }
     }
 }
diff --git a/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs b/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
index d8bdda7..0dfd12e 100644
--- a/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
+++ b/src/ClaudeDo.Ui/Views/TaskListView.axaml.cs
@@ -13,12 +13,11 @@ public partial class TaskListView : UserControl
 
     private void OnTaskItemDoubleTapped(object? sender, TappedEventArgs e)
     {
-        if (sender is Control c && c.DataContext is TaskItemViewModel item
+        if (sender is Control c && c.DataContext is TaskItemViewModel
             && DataContext is TaskListViewModel vm)
         {
-            vm.SelectedTask = item;
-            if (vm.EditTaskCommand.CanExecute(null))
-                vm.EditTaskCommand.Execute(null);
+            vm.EditTaskCommand.Execute(null);
+            e.Handled = true;
         }
     }
 }