diff --git a/mac/Sources/Byre/Project.swift b/mac/Sources/Byre/Project.swift
index acb0053..d35013a 100644
--- a/mac/Sources/Byre/Project.swift
+++ b/mac/Sources/Byre/Project.swift
@@ -317,8 +317,22 @@ private struct FollowCursor: ViewModifier {
                         }
                     }
                 }
+                #if os(macOS)
+                .onChange(of: shownList, initial: true) {
+                    if shownList != nil, store.paneFocus.inTaskPane {
+                        overlays.takeListKeys(overlays.taskList ? store.selectedTaskId : nil)
+                    }
+                }
+                #endif
         }
     }
+
+    private var shownList: String? {
+        guard listedTasks(store, overlays) != nil else {
+            return nil
+        }
+        return overlays.taskList ? "" : store.focusedProject()?.id
+    }
 }
 
 struct TaskList: View {