diff --git a/src/ClaudeDo.Ui/Views/MainWindow.axaml b/src/ClaudeDo.Ui/Views/MainWindow.axaml
index 76d4e42..b1723e0 100644
--- a/src/ClaudeDo.Ui/Views/MainWindow.axaml
+++ b/src/ClaudeDo.Ui/Views/MainWindow.axaml
@@ -32,6 +32,17 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate x:DataType="vm:ListItemViewModel">
                             <StackPanel Margin="4,2" DoubleTapped="OnListItemDoubleTapped">
+                                <StackPanel.ContextFlyout>
+                                    <MenuFlyout>
+                                        <MenuItem Header="Edit"
+                                                  Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).EditListCommand}"/>
+                                        <MenuItem Header="Delete"
+                                                  Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).DeleteListCommand}"/>
+                                        <Separator/>
+                                        <MenuItem Header="New Task"
+                                                  Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).TaskList.AddTaskCommand}"/>
+                                    </MenuFlyout>
+                                </StackPanel.ContextFlyout>
                                 <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/TaskListView.axaml b/src/ClaudeDo.Ui/Views/TaskListView.axaml
index 66a4ab7..cb5906c 100644
--- a/src/ClaudeDo.Ui/Views/TaskListView.axaml
+++ b/src/ClaudeDo.Ui/Views/TaskListView.axaml
@@ -19,6 +19,17 @@
             <ListBox.ItemTemplate>
                 <DataTemplate x:DataType="vm:TaskItemViewModel">
                     <Grid ColumnDefinitions="*,Auto,Auto" Margin="4,2" DoubleTapped="OnTaskItemDoubleTapped">
+                        <Grid.ContextFlyout>
+                            <MenuFlyout>
+                                <MenuItem Header="Edit"
+                                          Command="{Binding $parent[UserControl].((vm:TaskListViewModel)DataContext).EditTaskCommand}"/>
+                                <MenuItem Header="Delete"
+                                          Command="{Binding $parent[UserControl].((vm:TaskListViewModel)DataContext).DeleteTaskCommand}"/>
+                                <Separator/>
+                                <MenuItem Header="Run Now"
+                                          Command="{Binding RunNowCommand}"/>
+                            </MenuFlyout>
+                        </Grid.ContextFlyout>
                         <StackPanel Grid.Column="0">
                             <TextBlock Text="{Binding Title}" FontWeight="SemiBold"/>
                             <TextBlock Text="{Binding TagsText}" FontSize="10" Foreground="Gray"