diff --git a/mac/Sources/Byre/Chat.swift b/mac/Sources/Byre/Chat.swift
index 0286486..2a1f187 100644
--- a/mac/Sources/Byre/Chat.swift
+++ b/mac/Sources/Byre/Chat.swift
@@ -305,7 +305,8 @@ final class ChatModel {
             return []
         }
         let latest = latestReview(store.transcript)
-        let active = store.findTask(taskId)?.status == .active
+        let task = store.findTask(taskId)
+        let active = task.map { $0.status == .active && !$0.merging && !$0.mergingIntoParent && $0.mergeQueuedAt == nil && !$0.mergeAfterReview } ?? false
         var questions: [Int] = []
         var open: [Int] = []
         var ready: [Int] = []