diff --git a/docs/UX-BENCHMARKS.md b/docs/UX-BENCHMARKS.md
index 2af03f0..2caecac 100644
--- a/docs/UX-BENCHMARKS.md
+++ b/docs/UX-BENCHMARKS.md
@@ -78,7 +78,11 @@ Scheduled（有日期的）。
 
 - ✅ macOS 已落地：⌘/⇧ 多选 + 批量完成/排期/移动/删除，删除走单条撤销横幅
   （PRODUCT-SPEC §5b 已收录批量语义）。
-- 🔜 短期：Windows/Linux 跟进同一套多选与批量语义（见 README 平台状态）。
+- ✅ Windows 列表选择基础：WinUI Extended 模式支持 Ctrl/Shift
+  多选、方向键与范围选择；Enter 打开当前选中任务的编辑对话框，Esc
+  清除选择。按任务 ID 在列表刷新后恢复选择（普通列表与搜索结果）。
+- 🔜 **尚未完成**：Windows 的批量完成/排期/移动/删除、行内详情展开和撤销；
+  Linux 的批量操作；以及三平台按真实快捷键进行实机回归。
 
 ### 2.5 Quick Find
 
@@ -113,3 +117,15 @@ Scheduled（有日期的）。
   https://digitoolbook.com/en/blog/things3-minimalist-task-management-gtd
 - 2Do 官方功能页：https://www.2doapp.com/page-section/main-features
 - 2Do Focus Lists：https://www.2doapp.com/docs/ios/focus-lists
+
+### Windows task ownership recovery
+
+- ✅ Task rows expose a right-click **Move to List / 移动到列表** submenu for
+  other lists. It calls `update_task` with the target list ID, preserving
+  title, due date/time, completion state and notes.
+- This is the **explicit** recovery path for tasks already saved into the
+  wrong list by older Windows versions. Do not auto-migrate existing rows:
+  the original intended list cannot be inferred reliably.
+- Manual acceptance: move a task from 工作 to 生活, confirm it disappears from
+  工作, appears in 生活 and keeps all other fields; then restart and verify
+  ownership persists. Exercise both languages and all smart-list views.
diff --git a/scripts/e2e/e2e-windows.ps1 b/scripts/e2e/e2e-windows.ps1
index 7d721bd..c52ddce 100644
--- a/scripts/e2e/e2e-windows.ps1
+++ b/scripts/e2e/e2e-windows.ps1
@@ -101,6 +101,119 @@ try {
         return $false
     })
 
+    # Regression: a task entered in 生活 must stay in 生活, not the
+    # database's first/default list 工作. These are the shipped default
+    # list names, from racket/taskly/model.rkt. The disposable acceptance
+    # profile guarantees default-list id 1 and the new 生活 list id 2.
+    $createList = Wait-Until 'create-list control' { Find-ById $window 'create-list' }
+    $createList.GetCurrentPattern(
+        [System.Windows.Automation.InvokePattern]::Pattern).Invoke()
+    $nameInput = Wait-Until 'new-list input' { Find-ById $window 'prompt-input' }
+    $nameInput.GetCurrentPattern(
+        [System.Windows.Automation.ValuePattern]::Pattern).SetValue('生活')
+    $confirm = Wait-Until 'new-list confirmation' { Find-ByName $window 'OK' }
+    $confirm.GetCurrentPattern(
+        [System.Windows.Automation.InvokePattern]::Pattern).Invoke()
+
+    function Select-TaskList {
+        param([int]$ListId, [string]$Name)
+        # WinUI's inner Grid is not a ControlView automation peer (verified
+        # against the failing packaged Windows screenshot). Resolve the
+        # displayed TextBlock instead, then select its ListViewItem parent.
+        $label = Wait-Until ("visible list: {0}" -f $Name) {
+            $found = Find-ById $window ("list-name-{0}" -f $ListId)
+            if ($null -eq $found) { $found = Find-ByName $window $Name }
+            return $found
+        }
+        $item = $label
+        $walker = [System.Windows.Automation.TreeWalker]::ControlViewWalker
+        while ($null -ne $item -and
+               $item.Current.ControlType -ne [System.Windows.Automation.ControlType]::ListItem) {
+            $item = $walker.GetParent($item)
+        }
+        if ($null -eq $item) { throw ("no selectable list item for {0}" -f $Name) }
+        $item.GetCurrentPattern(
+            [System.Windows.Automation.SelectionItemPattern]::Pattern).Select()
+    }
+
+    $paneTitle = Wait-Until 'active view label' {
+        Find-ById $window 'current-view-title'
+    }
+    Select-TaskList 2 '生活'
+    [void](Wait-Until '生活 view selected' {
+        if ($paneTitle.Current.Name -eq '生活') { return $true }
+        return $false
+    })
+    $plainTask = 'Life-only task without due date or notes'
+    $quickAdd.GetCurrentPattern(
+        [System.Windows.Automation.ValuePattern]::Pattern).SetValue($plainTask)
+    $quickAdd.SetFocus()
+    # Exercise the actual Enter key, not only the plus-button click.
+    [System.Windows.Forms.SendKeys]::SendWait('{ENTER}')
+
+    $titleText = Wait-Until 'task saved under 生活' {
+        Find-ByName $window $plainTask
+    }
+    # Layout assertions use the text and native checkbox peers: a Grid
+    # itself is not reliably exposed in WinUI UIA's ControlView.
+    $plainCheck = Wait-Until 'new task checkbox' {
+        Find-ById $window 'task-complete-2'
+    }
+    # Both elements share the row's first Grid row; the title must
+    # visually align with the native checkbox for a metadata-free task.
+    $checkBoxBounds = $plainCheck.Current.BoundingRectangle
+    $titleBounds = $titleText.Current.BoundingRectangle
+    $centerDiff = [Math]::Abs(
+        ($checkBoxBounds.Top + $checkBoxBounds.Height / 2) -
+        ($titleBounds.Top + $titleBounds.Height / 2))
+    $limit = [Math]::Max(8.0, $checkBoxBounds.Height / 4)
+    if ($centerDiff -gt $limit) {
+        throw ("plain task title and checkbox are misaligned by {0:N1}px" -f $centerDiff)
+    }
+
+    $taskList = Wait-Until 'extended task list' {
+        Find-ById $window 'task-list'
+    }
+    $selection = $taskList.GetCurrentPattern(
+        [System.Windows.Automation.SelectionPattern]::Pattern)
+    if (-not $selection.Current.CanSelectMultiple) {
+        throw 'Windows task list must support Ctrl/Shift multi-selection'
+    }
+
+    Select-TaskList 1 '工作'
+    [void](Wait-Until '工作 view selected' {
+        if ($paneTitle.Current.Name -eq '工作') { return $true }
+        return $false
+    })
+    [void](Wait-Until '生活 task absent from 工作' {
+        if ($null -eq (Find-ByName $window $plainTask)) { return $true }
+        return $false
+    })
+    Select-TaskList 2 '生活'
+    [void](Wait-Until '生活 task remains in 生活' {
+        if ($paneTitle.Current.Name -eq '生活' -and
+            $null -ne (Find-ByName $window $plainTask)) { return $true }
+        return $false
+    })
+
+    # Search is global, even while 生活 is selected. A result must
+    # display its owning list, never appear as an unlabeled local row.
+    $searchBox = Wait-Until 'search box' { Find-ById $window 'task-search' }
+    $searchBox.GetCurrentPattern(
+        [System.Windows.Automation.ValuePattern]::Pattern).SetValue($plainTask)
+    $owner = Wait-Until 'search result list owner' {
+        Find-ById $window 'task-owner-2'
+    }
+    if ($owner.Current.Name -ne '生活') {
+        throw ("search result claims wrong owner: {0}" -f $owner.Current.Name)
+    }
+    $searchBox.GetCurrentPattern(
+        [System.Windows.Automation.ValuePattern]::Pattern).SetValue('')
+    [void](Wait-Until 'search cleared' {
+        if ($null -eq (Find-ById $window 'task-owner-2')) { return $true }
+        return $false
+    })
+
     $nodes = $window.FindAll(
         [System.Windows.Automation.TreeScope]::Descendants,
         [System.Windows.Automation.Condition]::TrueCondition)
@@ -127,12 +240,17 @@ try {
     [ordered]@{
         platform = 'windows'
         artifact = $executable.FullName
-        actions = @('set:quick-add', 'invoke:quick-add-submit', 'toggle:task-complete-1')
+        actions = @('set:quick-add', 'invoke:quick-add-submit', 'toggle:task-complete-1', 'create-list:生活', 'select-list:2', 'enter:quick-add', 'select-list:1', 'select-list:2')
         assertions = @(
             'packaged WinUI window activated',
             'stable UI Automation identifiers exposed',
             'RPC-created task appeared',
             'changed Event removed the completed task from the active view',
+            'new task submitted by Enter is owned by 生活, not 工作',
+            'task checkbox and plain-text title are vertically aligned',
+            'Windows task list exposes native multiple selection',
+            'view switches preserve task list ownership',
+            'global search shows the real owning list for every task',
             'native window close stopped the process'
         )
     } | ConvertTo-Json -Depth 5 |
diff --git a/shared/spec/PRODUCT-SPEC.md b/shared/spec/PRODUCT-SPEC.md
index 99dfd5c..8a41797 100644
--- a/shared/spec/PRODUCT-SPEC.md
+++ b/shared/spec/PRODUCT-SPEC.md
@@ -52,6 +52,13 @@ README's honest gaps).
   text first runs through ExtractTimeCommand (trailing `@10am`, `+1d`…),
   target list = selected list else first list (none → error
   `taskCreateListFirst`); new task lands at top; counts refresh.
+  The host captures the **concrete list ID at submission**, before any
+  asynchronous parsing or persistence. Switching lists while the request
+  is running must never change the destination. No list / invalid selected
+  list must keep the unsent text rather than silently using another list.
+  The Windows packaged acceptance must create a second list, submit a
+  task via Enter, verify that it remains in the selected list, and verify
+  that it never appears in the first/default list.
 - Empty states: not connected → 📂 + `taskListEmptyHint`; connected and
   empty → ✓ + `taskListEmpty`.
 - Row order per view (SQL in DATA-FORMAT/CLI-SPEC §list): All & list views
@@ -64,6 +71,10 @@ README's honest gaps).
 
 - 20px circular checkbox: incomplete = hollow ring; complete = ring +
   check in accent; completed text gets strikethrough + tertiary color.
+  The checkbox and task title share the **same first-row vertical center**
+  on every platform. Due date, time and notes (only when actually present)
+  sit beneath the title, not beside or vertically above the checkbox.
+  A task with no metadata renders as one clean centered checkbox/title row.
 - Meta line under the text when present: the localized due date
   (today/tomorrow/yesterday/`Aug 31`/`8月31日`, plus the time when set) in
   its semantic color (overdue incomplete `#FF3B30`, due today accent,
diff --git a/windows/MainWindow.xaml b/windows/MainWindow.xaml
index eca5d31..f167cb4 100644
--- a/windows/MainWindow.xaml
+++ b/windows/MainWindow.xaml
@@ -238,6 +238,7 @@
                                 Foreground="{ThemeResource TasklySecondaryTextBrush}" />
                             <Button
                                 x:Name="NewListButton"
+                                AutomationProperties.AutomationId="create-list"
                                 Grid.Column="1"
                                 Padding="6,2"
                                 Background="Transparent"
@@ -303,6 +304,7 @@
                         Margin="10,0,12,0">
                         <TextBlock
                             x:Name="PaneTitle"
+                            AutomationProperties.AutomationId="current-view-title"
                             FontSize="22"
                             FontWeight="SemiBold"
                             TextTrimming="CharacterEllipsis" />
@@ -315,6 +317,7 @@
                     <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="12" VerticalAlignment="Center">
                         <TextBox
                             x:Name="SearchBox"
+                            AutomationProperties.AutomationId="task-search"
                             Width="200"
                             Height="28"
                             CornerRadius="10"
@@ -401,8 +404,10 @@
                         <ScrollViewer VerticalScrollBarVisibility="Auto">
                             <ListView
                                 x:Name="TaskList"
+                                AutomationProperties.AutomationId="task-list"
                                 Margin="16,0,16,16"
-                                SelectionMode="Single">
+                                SelectionMode="Extended"
+                                KeyDown="OnTaskListKeyDown">
                                 <ListView.ItemContainerStyle>
                                     <Style TargetType="ListViewItem">
                                         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -421,7 +426,10 @@
                         VerticalScrollBarVisibility="Auto">
                         <ListView
                             x:Name="SearchResults"
-                            Margin="24,8,24,16">
+                            AutomationProperties.AutomationId="search-task-list"
+                            Margin="24,8,24,16"
+                            SelectionMode="Extended"
+                            KeyDown="OnTaskListKeyDown">
                             <ListView.ItemContainerStyle>
                                 <Style TargetType="ListViewItem">
                                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
diff --git a/windows/MainWindow.xaml.cpp b/windows/MainWindow.xaml.cpp
index f95a0d0..a73a908 100644
--- a/windows/MainWindow.xaml.cpp
+++ b/windows/MainWindow.xaml.cpp
@@ -9,6 +9,7 @@
 #include <functional>
 #include <iterator>
 #include <map>
+#include <set>
 #include <shobjidl_core.h>
 #include <stdexcept>
 
@@ -839,6 +840,10 @@ void MainWindow::RenderSidebar() {
 
     auto text = mxc::TextBlock{};
     text.Text(wide(list.name));
+    // WinUI exposes TextBlock peers to UIA; the surrounding Grid is not
+    // reliably in ControlView. Test/assistive clients can find this label.
+    winrt::Microsoft::UI::Xaml::Automation::AutomationProperties::SetAutomationId(
+        text, L"list-name-" + std::to_wstring(list.id));
     text.TextTrimming(mx::TextTrimming::CharacterEllipsis);
     text.VerticalAlignment(mx::VerticalAlignment::Center);
     mxc::Grid::SetColumn(text, 1);
@@ -867,6 +872,8 @@ void MainWindow::RenderSidebar() {
     row.ContextFlyout(menu);
 
     row.Tag(winrt::box_value<std::int64_t>(list.id));
+    winrt::Microsoft::UI::Xaml::Automation::AutomationProperties::SetAutomationId(
+        row, L"list-" + std::to_wstring(list.id));
     UserList().Items().Append(row);
     if (view_ == ViewKind::List && view_list_id_ == list.id) {
       UserList().SelectedIndex(UserList().Items().Size() - 1);
@@ -878,9 +885,21 @@ void MainWindow::RenderTasks() {
   PaneTitle().Text(view_title());
   PaneSubtitle().Text(view_subtitle());
 
+  // Preserve selection across changed-event and poll snapshot rebuilds.
+  // Selection is by task identity, never by its list index (order can shift).
+  std::set<std::int64_t> selected_ids;
+  for (auto const& selected : TaskList().SelectedItems()) {
+    if (auto row = selected.try_as<mxc::Grid>()) {
+      selected_ids.insert(winrt::unbox_value<std::int64_t>(row.Tag()));
+    }
+  }
   TaskList().Items().Clear();
   for (auto const& task : tasks_) {
-    TaskList().Items().Append(MakeTaskRow(task));
+    auto row = MakeTaskRow(task);
+    TaskList().Items().Append(row);
+    if (selected_ids.count(task.id) != 0) {
+      TaskList().SelectedItems().Append(row);
+    }
   }
 
   // While a search is live its pane replaces the normal one; otherwise the
@@ -901,49 +920,72 @@ void MainWindow::RenderTasks() {
 }
 
 void MainWindow::RenderSearchResults() {
+  std::set<std::int64_t> selected_ids;
+  for (auto const& selected : SearchResults().SelectedItems()) {
+    if (auto row = selected.try_as<mxc::Grid>()) {
+      selected_ids.insert(winrt::unbox_value<std::int64_t>(row.Tag()));
+    }
+  }
   SearchResults().Items().Clear();
   for (auto const& task : search_results_) {
-    SearchResults().Items().Append(MakeTaskRow(task));
+    auto row = MakeTaskRow(task, /*search_result=*/true);
+    SearchResults().Items().Append(row);
+    if (selected_ids.count(task.id) != 0) {
+      SearchResults().SelectedItems().Append(row);
+    }
   }
 }
 
-mxc::Grid MainWindow::MakeTaskRow(rivet_app::Task const& task) {
+mxc::Grid MainWindow::MakeTaskRow(rivet_app::Task const& task,
+                                   bool search_result) {
   auto row = mxc::Grid{};
   row.ColumnDefinitions().Append(mxc::ColumnDefinition{});
   row.ColumnDefinitions().Append(mxc::ColumnDefinition{});
   row.ColumnDefinitions().GetAt(0).Width(mx::GridLength{0, mx::GridUnitType::Auto});
   row.ColumnDefinitions().GetAt(1).Width(
       mx::GridLength{1, mx::GridUnitType::Star});
+  // The checkbox and title must be centered in the SAME first row. Metadata
+  // and notes (when present) occupy a second row under the title only.
+  row.RowDefinitions().Append(mxc::RowDefinition{});
+  row.RowDefinitions().Append(mxc::RowDefinition{});
   row.Padding(mx::ThicknessHelper::FromLengths(4, 4, 4, 4));
   row.Tag(winrt::box_value<std::int64_t>(task.id));
+  winrt::Microsoft::UI::Xaml::Automation::AutomationProperties::SetAutomationId(
+      row, L"task-row-" + std::to_wstring(task.id));
 
   auto check = mxc::CheckBox{};
   winrt::Microsoft::UI::Xaml::Automation::AutomationProperties::SetAutomationId(
       check, L"task-complete-" + std::to_wstring(task.id));
   check.IsChecked(task.completed);
   check.MinWidth(0);
+  check.VerticalAlignment(mx::VerticalAlignment::Center);
   check.Checked({this, &MainWindow::OnTaskCheckChanged});
   check.Unchecked({this, &MainWindow::OnTaskCheckChanged});
   check.Tag(winrt::box_value<std::int64_t>(task.id));
   mxc::Grid::SetColumn(check, 0);
+  mxc::Grid::SetRow(check, 0);
   row.Children().Append(check);
 
-  auto content = mxc::StackPanel{};
-  content.Margin(mx::ThicknessHelper::FromLengths(8, 0, 0, 0));
-  content.Spacing(2);
-  mxc::Grid::SetColumn(content, 1);
-  row.Children().Append(content);
-
   auto text = mxc::TextBlock{};
   text.Text(wide(task.text));
   text.FontSize(14);
   text.TextTrimming(mx::TextTrimming::CharacterEllipsis);
+  text.Margin(mx::ThicknessHelper::FromLengths(8, 0, 0, 0));
+  text.VerticalAlignment(mx::VerticalAlignment::Center);
+  mxc::Grid::SetColumn(text, 1);
+  mxc::Grid::SetRow(text, 0);
   if (task.completed) {
     text.Foreground(ThemeBrush(L"TasklyMutedTextBrush"));
     text.TextDecorations(
         winrt::Windows::UI::Text::TextDecorations::Strikethrough);
   }
-  content.Children().Append(text);
+  row.Children().Append(text);
+
+  auto details = mxc::StackPanel{};
+  details.Margin(mx::ThicknessHelper::FromLengths(8, 0, 0, 0));
+  details.Spacing(2);
+  mxc::Grid::SetColumn(details, 1);
+  mxc::Grid::SetRow(details, 1);
 
   // Meta line (PRODUCT-SPEC §5, DESIGN-TOKENS task row): owning list name
   // with its color dot in the smart views, then the due chip; the notes
@@ -951,8 +993,11 @@ mxc::Grid MainWindow::MakeTaskRow(rivet_app::Task const& task) {
   auto meta = mxc::StackPanel{};
   meta.Orientation(mxc::Orientation::Horizontal);
   meta.Spacing(8);
-  if (view_ != ViewKind::List && task.list_name.has_value() &&
-      !task.list_name->empty()) {
+  // A search can return tasks from ANY list, even when the sidebar has a
+  // named list selected. Show ownership on all search rows to avoid
+  // implying a result belongs to the active list.
+  if ((search_result || view_ != ViewKind::List) &&
+      task.list_name.has_value() && !task.list_name->empty()) {
     auto list_label = mxc::StackPanel{};
     list_label.Orientation(mxc::Orientation::Horizontal);
     list_label.Spacing(4);
@@ -965,6 +1010,10 @@ mxc::Grid MainWindow::MakeTaskRow(rivet_app::Task const& task) {
     list_label.Children().Append(dot);
     auto list_text = mxc::TextBlock{};
     list_text.Text(wide(*task.list_name));
+    if (search_result) {
+      winrt::Microsoft::UI::Xaml::Automation::AutomationProperties::SetAutomationId(
+          list_text, L"task-owner-" + std::to_wstring(task.id));
+    }
     list_text.FontSize(12);
     list_text.Foreground(ThemeBrush(L"TasklySecondaryTextBrush"));
     list_text.VerticalAlignment(mx::VerticalAlignment::Center);
@@ -1000,7 +1049,7 @@ mxc::Grid MainWindow::MakeTaskRow(rivet_app::Task const& task) {
     meta.Children().Append(chip_text);
   }
   if (meta.Children().Size() > 0) {
-    content.Children().Append(meta);
+    details.Children().Append(meta);
   }
 
   // Notes preview: single line, ellipsized, muted (PRODUCT-SPEC §5).
@@ -1010,7 +1059,11 @@ mxc::Grid MainWindow::MakeTaskRow(rivet_app::Task const& task) {
     notes_line.FontSize(12);
     notes_line.TextTrimming(mx::TextTrimming::CharacterEllipsis);
     notes_line.Foreground(ThemeBrush(L"TasklyMutedTextBrush"));
-    content.Children().Append(notes_line);
+    details.Children().Append(notes_line);
+  }
+
+  if (details.Children().Size() > 0) {
+    row.Children().Append(details);
   }
 
   auto menu = mxc::MenuFlyout{};
@@ -1035,6 +1088,31 @@ mxc::Grid MainWindow::MakeTaskRow(rivet_app::Task const& task) {
   edit.Tag(winrt::box_value<std::int64_t>(task.id));
   edit.Click({this, &MainWindow::OnEditTask});
   menu.Items().Append(edit);
+
+  // The same Move to List operation is available on macOS. It also lets
+  // users correct tasks created by older Windows builds that incorrectly
+  // defaulted every quick add to the first list.
+  if (lists_.size() > 1) {
+    auto move_to = mxc::MenuFlyoutSubItem{};
+    move_to.Text(t("menuMoveToList"));
+    for (auto const& list : lists_) {
+      if (list.id == task.list_id) continue;
+      auto target = mxc::MenuFlyoutItem{};
+      target.Text(wide(list.icon.value_or("")) + L" " + wide(list.name));
+      auto const task_id = task.id;
+      auto const target_id = list.id;
+      target.Click(
+          [weak = get_weak(), task_id, target_id](
+              winrt::Windows::Foundation::IInspectable const&,
+              Microsoft::UI::Xaml::RoutedEventArgs const&) {
+            if (auto window = weak.get()) {
+              window->MoveTaskToListAsync(task_id, target_id);
+            }
+          });
+      move_to.Items().Append(target);
+    }
+    menu.Items().Append(move_to);
+  }
   auto remove = mxc::MenuFlyoutItem{};
   remove.Text(t("taskDelete"));
   remove.Tag(winrt::box_value<std::int64_t>(task.id));
@@ -1047,6 +1125,20 @@ mxc::Grid MainWindow::MakeTaskRow(rivet_app::Task const& task) {
   return row;
 }
 
+void MainWindow::RefreshSearchIfActive() {
+  if (!current_search_.empty()) RunSearchAsync(current_search_);
+}
+
+rivet_app::Task const* MainWindow::FindTaskForAction(
+    std::int64_t id) const {
+  // The search pane has an independent, global result set. Its tasks may
+  // not be part of the currently selected list's filtered snapshot.
+  if (!current_search_.empty()) {
+    if (auto const* task = find_by_id(search_results_, id)) return task;
+  }
+  return find_by_id(tasks_, id);
+}
+
 winrt::hstring MainWindow::DueLabel(std::string const& due_date) const {
   auto const today = date_string(0);
   auto const compare = date_compare(due_date, today);
@@ -1157,6 +1249,8 @@ winrt::fire_and_forget MainWindow::PromptAsync(
     std::wstring const& initial,
     std::function<void(std::wstring const&)> on_ok) {
   auto input = mxc::TextBox{};
+  winrt::Microsoft::UI::Xaml::Automation::AutomationProperties::SetAutomationId(
+      input, L"prompt-input");
   input.PlaceholderText(placeholder);
   input.Text(initial);
   // The system focus indicator (blue outline + white inner frame) clashes
@@ -1301,7 +1395,8 @@ winrt::fire_and_forget MainWindow::ReloadTasksAsync() {
             ? std::optional<std::int64_t>(list_id)
             : std::nullopt,
         include_completed,
-        [dispatcher, weak](rivet_app::Result<rivet_app::Snapshot> result) {
+        [dispatcher, weak, view_kind, list_id, include_completed](
+            rivet_app::Result<rivet_app::Snapshot> result) {
           // Release the reload gate on every terminal path so later
           // polls and `changed` events are not swallowed.
           dispatcher.TryEnqueue([weak] {
@@ -1312,8 +1407,17 @@ winrt::fire_and_forget MainWindow::ReloadTasksAsync() {
           });
           try {
             auto const snapshot = result.get();
-            dispatcher.TryEnqueue([weak, snapshot] {
+            dispatcher.TryEnqueue(
+                [weak, snapshot, view_kind, list_id, include_completed] {
               if (auto window = weak.get()) {
+                // The user may switch lists while this RPC is in flight:
+                // never paint a Work snapshot under the Life heading.
+                if (window->view_ != view_kind ||
+                    window->view_list_id_ != list_id ||
+                    window->show_completed_ != include_completed) {
+                  window->ReloadTasksAsync();
+                  return;
+                }
                 window->ApplySnapshot(snapshot, /*force=*/false);
                 // An in-flight download owns the status line.
                 if (!window->update_downloading_) {
@@ -1395,10 +1499,25 @@ winrt::fire_and_forget MainWindow::OpenDatabaseAsync(std::wstring const& path) {
                     find_by_id(snapshot.lists, restored) != nullptr) {
                   window->view_ = MainWindow::ViewKind::List;
                   window->view_list_id_ = restored;
+                } else {
+                  window->view_ = MainWindow::ViewKind::All;
+                  window->view_list_id_ = 0;
+                }
+                // open_database returns an ALL-view snapshot. Never show
+                // those rows under a restored named-list heading: wait for
+                // the filtered list snapshot instead.
+                if (window->view_ == MainWindow::ViewKind::List) {
+                  window->has_applied_snapshot_ = false;
+                  window->current_counts_ = snapshot.counts;
+                  window->lists_ = snapshot.lists;
+                  window->tasks_.clear();
+                  window->RenderSidebar();
+                  window->RenderTasks();
+                  window->ReloadTasksAsync();
+                } else {
+                  // Opening another DB invalidates the previous fingerprint.
+                  window->ApplySnapshot(snapshot, /*force=*/true);
                 }
-                // A different database was just opened: always render, even
-                // if its content matches the previous one byte for byte.
-                window->ApplySnapshot(snapshot, /*force=*/true);
                 // An in-flight download owns the status line.
                 if (!window->update_downloading_) {
                   window->SetStatus(t("statusDatabaseConnected"));
@@ -1419,7 +1538,8 @@ winrt::fire_and_forget MainWindow::OpenDatabaseAsync(std::wstring const& path) {
   }
 }
 
-winrt::fire_and_forget MainWindow::AddTaskAsync(std::wstring const& text) {
+winrt::fire_and_forget MainWindow::AddTaskAsync(std::wstring const& text,
+                                               std::int64_t target_list_id) {
   if (backend_ == nullptr || !backend_->running() || text.empty()) {
     co_return;
   }
@@ -1432,22 +1552,26 @@ winrt::fire_and_forget MainWindow::AddTaskAsync(std::wstring const& text) {
     // due (parse_quick_add); this host only forwards the result.
     (void)api.parse_quick_add_async(
         winrt::to_string(text),
-        [dispatcher, weak, backend](rivet_app::Result<rivet_app::QuickAddParse> parsed) {
+        [dispatcher, weak, backend, text, target_list_id](rivet_app::Result<rivet_app::QuickAddParse> parsed) {
           try {
             auto const parse = parsed.get();
             rivet_app::API api(*backend);
             // `changed` triggers the authoritative reload; the completion
             // only surfaces failures.
             (void)api.add_task_async(
-                parse.text, std::nullopt, parse.due_date, parse.due_time,
-                std::nullopt,
-                [dispatcher, weak](rivet_app::Result<rivet_app::Task> result) {
+                parse.text, std::optional<std::int64_t>(target_list_id),
+                parse.due_date, parse.due_time, std::nullopt,
+                [dispatcher, weak, text](rivet_app::Result<rivet_app::Task> result) {
                   try {
                     result.get();
                   } catch (std::exception const& e) {
                     auto message = std::string(e.what());
-                    dispatcher.TryEnqueue([weak, message = std::move(message)] {
+                    dispatcher.TryEnqueue([weak, text, message = std::move(message)] {
                       if (auto window = weak.get()) {
+                        // Never replace a newer draft typed while the RPC ran.
+                        if (window->NewTaskBox().Text().empty()) {
+                          window->NewTaskBox().Text(text);
+                        }
                         window->SetError(message);
                       }
                     });
@@ -1455,14 +1579,20 @@ winrt::fire_and_forget MainWindow::AddTaskAsync(std::wstring const& text) {
                 });
           } catch (std::exception const& e) {
             auto message = std::string(e.what());
-            dispatcher.TryEnqueue([weak, message = std::move(message)] {
+            dispatcher.TryEnqueue([weak, text, message = std::move(message)] {
               if (auto window = weak.get()) {
+                if (window->NewTaskBox().Text().empty()) {
+                  window->NewTaskBox().Text(text);
+                }
                 window->SetError(message);
               }
             });
           }
         });
   } catch (std::exception const& e) {
+    if (NewTaskBox().Text().empty()) {
+      NewTaskBox().Text(text);
+    }
     SetError(e.what());
   }
 }
@@ -1482,6 +1612,9 @@ winrt::fire_and_forget MainWindow::ToggleTaskAsync(std::int64_t id,
         [dispatcher, weak](rivet_app::Result<rivet_app::Task> result) {
           try {
             result.get();
+            dispatcher.TryEnqueue([weak] {
+              if (auto window = weak.get()) window->RefreshSearchIfActive();
+            });
           } catch (std::exception const& e) {
             auto message = std::string(e.what());
             dispatcher.TryEnqueue([weak, message = std::move(message)] {
@@ -1511,6 +1644,9 @@ winrt::fire_and_forget MainWindow::RenameTaskAsync(std::int64_t id,
         [dispatcher, weak](rivet_app::Result<rivet_app::Task> result) {
           try {
             result.get();
+            dispatcher.TryEnqueue([weak] {
+              if (auto window = weak.get()) window->RefreshSearchIfActive();
+            });
           } catch (std::exception const& e) {
             auto message = std::string(e.what());
             dispatcher.TryEnqueue([weak, message = std::move(message)] {
@@ -1531,7 +1667,7 @@ winrt::fire_and_forget MainWindow::SetTaskDueAsync(std::int64_t id,
     co_return;
   }
   // Start from the stored task so untouched fields survive update_task.
-  auto const* stored = find_by_id(tasks_, id);
+  auto const* stored = FindTaskForAction(id);
   if (stored == nullptr) {
     co_return;
   }
@@ -1548,6 +1684,54 @@ winrt::fire_and_forget MainWindow::SetTaskDueAsync(std::int64_t id,
         updated, [dispatcher, weak](rivet_app::Result<rivet_app::Task> result) {
           try {
             result.get();
+            dispatcher.TryEnqueue([weak] {
+              if (auto window = weak.get()) window->RefreshSearchIfActive();
+            });
+          } catch (std::exception const& e) {
+            auto message = std::string(e.what());
+            dispatcher.TryEnqueue([weak, message = std::move(message)] {
+              if (auto window = weak.get()) {
+                window->SetError(message);
+              }
+            });
+          }
+        });
+  } catch (std::exception const& e) {
+    SetError(e.what());
+  }
+}
+
+winrt::fire_and_forget MainWindow::MoveTaskToListAsync(
+    std::int64_t id, std::int64_t target_list_id) {
+  if (backend_ == nullptr || !backend_->running()) {
+    co_return;
+  }
+  auto const* stored = FindTaskForAction(id);
+  auto const* destination = find_by_id(lists_, target_list_id);
+  if (stored == nullptr || destination == nullptr ||
+      stored->list_id == target_list_id) {
+    co_return;
+  }
+  // Keep title, due date, time, completed state and notes unchanged.
+  auto updated = *stored;
+  updated.list_id = target_list_id;
+  auto const list_name = wide(destination->name);
+  auto const dispatcher = DispatcherQueue();
+  auto const weak = get_weak();
+  auto backend = backend_;
+  try {
+    rivet_app::API api(*backend);
+    (void)api.update_task_async(
+        updated, [dispatcher, weak, list_name](
+                     rivet_app::Result<rivet_app::Task> result) {
+          try {
+            result.get();
+            dispatcher.TryEnqueue([weak, list_name] {
+              if (auto window = weak.get()) {
+                window->SetStatus(tf("statusTaskMoved", list_name));
+                window->RefreshSearchIfActive();
+              }
+            });
           } catch (std::exception const& e) {
             auto message = std::string(e.what());
             dispatcher.TryEnqueue([weak, message = std::move(message)] {
@@ -1575,6 +1759,9 @@ winrt::fire_and_forget MainWindow::DeleteTaskAsync(std::int64_t id) {
         id, [dispatcher, weak](rivet_app::Result<bool> result) {
           try {
             result.get();
+            dispatcher.TryEnqueue([weak] {
+              if (auto window = weak.get()) window->RefreshSearchIfActive();
+            });
           } catch (std::exception const& e) {
             auto message = std::string(e.what());
             dispatcher.TryEnqueue([weak, message = std::move(message)] {
@@ -2036,6 +2223,42 @@ void MainWindow::OnShowCompletedChanged(
   ReloadTasksAsync();
 }
 
+void MainWindow::OnTaskListKeyDown(
+    winrt::Windows::Foundation::IInspectable const& sender,
+    Microsoft::UI::Xaml::Input::KeyRoutedEventArgs const& args) {
+  // Text fields and editable task controls retain their normal shortcuts.
+  if (args.OriginalSource().try_as<mxc::TextBox>()) return;
+
+  auto list = sender.try_as<mxc::ListView>();
+  if (!list) return;
+  if (args.Key() == Windows::System::VirtualKey::Escape) {
+    if (!list.SelectedItems().Size()) return;
+    list.SelectedItems().Clear();
+    args.Handled(true);
+    return;
+  }
+  if (args.Key() != Windows::System::VirtualKey::Enter ||
+      list.SelectedItems().Size() != 1) {
+    // WinUI natively handles Up/Down, Ctrl-click and Shift-click/ranges
+    // in Extended mode. Do not swallow its keyboard navigation.
+    return;
+  }
+
+  auto row = list.SelectedItems().GetAt(0).try_as<mxc::Grid>();
+  if (!row) return;
+  auto const id = winrt::unbox_value<std::int64_t>(row.Tag());
+  auto const* task = FindTaskForAction(id);
+  if (!task) return;
+  args.Handled(true);
+  auto const weak = get_weak();
+  PromptAsync(t("dialogTaskDetail"), L"", wide(task->text),
+              [weak, id](std::wstring const& updated) {
+                if (auto window = weak.get()) {
+                  window->RenameTaskAsync(id, updated);
+                }
+              });
+}
+
 void MainWindow::OnNewTaskKeyDown(
     winrt::Windows::Foundation::IInspectable const&,
     Microsoft::UI::Xaml::Input::KeyRoutedEventArgs const& args) {
@@ -2046,8 +2269,29 @@ void MainWindow::OnNewTaskKeyDown(
 
 void MainWindow::CommitQuickAdd() {
   auto const text = std::wstring(NewTaskBox().Text());
+  // Keep unsent input when the backend is unavailable; otherwise the
+  // user loses their draft before AddTaskAsync can reject the request.
+  if (text.find_first_not_of(L" \t\r\n") == std::wstring::npos ||
+      backend_ == nullptr || !backend_->running()) {
+    return;
+  }
+  // Match macOS/Linux: a named list owns new tasks; smart views use the
+  // first list only as an explicit fallback. Capture the target BEFORE the
+  // async parser runs, so switching views cannot redirect an in-flight add.
+  std::optional<std::int64_t> target_list_id;
+  if (view_ == ViewKind::List) {
+    if (find_by_id(lists_, view_list_id_) != nullptr) {
+      target_list_id = view_list_id_;
+    }
+  } else if (!lists_.empty()) {
+    target_list_id = lists_.front().id;
+  }
+  if (!target_list_id.has_value()) {
+    SetStatus(t("taskCreateListFirst"));
+    return;  // Keep the user's draft until a valid destination exists.
+  }
   NewTaskBox().Text(L"");
-  AddTaskAsync(text);
+  AddTaskAsync(text, *target_list_id);
 }
 
 void MainWindow::OnQuickAddCommit(
@@ -2208,7 +2452,7 @@ void MainWindow::OnEditTask(
   } else {
     return;
   }
-  auto const* task = find_by_id(tasks_, id);
+  auto const* task = FindTaskForAction(id);
   if (task == nullptr) {
     return;
   }
diff --git a/windows/MainWindow.xaml.h b/windows/MainWindow.xaml.h
index 25acf31..5960d21 100644
--- a/windows/MainWindow.xaml.h
+++ b/windows/MainWindow.xaml.h
@@ -73,6 +73,8 @@ struct MainWindow : MainWindowT<MainWindow> {
                               Microsoft::UI::Xaml::RoutedEventArgs const&);
   void OnNewTaskKeyDown(winrt::Windows::Foundation::IInspectable const&,
                         Microsoft::UI::Xaml::Input::KeyRoutedEventArgs const&);
+  void OnTaskListKeyDown(winrt::Windows::Foundation::IInspectable const&,
+                         Microsoft::UI::Xaml::Input::KeyRoutedEventArgs const&);
 
   // Update download action wired from XAML; event handlers must be public
   // because generated Connect() binds them through MainWindowT.
@@ -98,7 +100,9 @@ struct MainWindow : MainWindowT<MainWindow> {
   winrt::Microsoft::UI::Xaml::Media::Brush ListBrush(
       rivet_app::TodoList const& list);
   winrt::Microsoft::UI::Xaml::Controls::Grid MakeTaskRow(
-      rivet_app::Task const& task);
+      rivet_app::Task const& task, bool search_result = false);
+  rivet_app::Task const* FindTaskForAction(std::int64_t id) const;
+  void RefreshSearchIfActive();
   winrt::hstring DueLabel(std::string const& due_date) const;
   std::wstring view_title() const;
   winrt::hstring view_subtitle() const;
@@ -117,11 +121,14 @@ struct MainWindow : MainWindowT<MainWindow> {
   winrt::fire_and_forget ReloadTasksAsync();
   winrt::fire_and_forget OpenDefaultDatabaseAsync();
   winrt::fire_and_forget OpenDatabaseAsync(std::wstring const& path);
-  winrt::fire_and_forget AddTaskAsync(std::wstring const& text);
+  winrt::fire_and_forget AddTaskAsync(std::wstring const& text,
+                                       std::int64_t target_list_id);
   winrt::fire_and_forget ToggleTaskAsync(std::int64_t id, bool completed);
   winrt::fire_and_forget RenameTaskAsync(std::int64_t id, std::wstring const& text);
   winrt::fire_and_forget SetTaskDueAsync(std::int64_t id, std::wstring const& due_date);
   winrt::fire_and_forget DeleteTaskAsync(std::int64_t id);
+  winrt::fire_and_forget MoveTaskToListAsync(
+      std::int64_t id, std::int64_t target_list_id);
   winrt::fire_and_forget CreateListAsync(std::wstring const& name);
   winrt::fire_and_forget RenameListAsync(std::int64_t id, std::wstring const& name);
   winrt::fire_and_forget DeleteListAsync(std::int64_t id);