diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29f527c..3fa4efc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
 
 ## [Unreleased]
 
+### Fixed
+- Fixed `todo` option of `task` to propagate globally
+
 ## [0.5.0] - 2026-01-24
 
 ### Breaking
diff --git a/src/task.typ b/src/task.typ
index d7057bd..d4cfc4a 100644
--- a/src/task.typ
+++ b/src/task.typ
@@ -147,6 +147,7 @@
 
   if (todo) {
     c("sheetstorm-todo").step()
+    c("sheetstorm-global-todo").step()
   }
 
   if theorem-counter-reset {
@@ -154,13 +155,9 @@
   }
 
   let maybe-todo = context {
-    let curr-task = query(selector(<sheetstorm-task>).before(here()))
-      .last()
-      .location()
     let curr-task-end = query(selector(<sheetstorm-task-end>).after(here()))
       .first()
       .location()
-
     let curr-todo-count = c("sheetstorm-todo").at(curr-task-end).first()
     if (curr-todo-count > 0) { todo-box() }
   }