diff --git a/bin/omarchy-migrate-notify b/bin/omarchy-migrate-notify
index 1f9fb541..b478e876 100755
--- a/bin/omarchy-migrate-notify
+++ b/bin/omarchy-migrate-notify
@@ -15,8 +15,8 @@ fi
 
 notify_command=$(printf 'if [[ -n $(omarchy-notification-send -u critical -g  "Pending Omarchy Migrations" %q -a) ]]; then omarchy-launch-floating-terminal-with-presentation omarchy-migrate; fi' "$message")
 
-# This runs from omarchy-migrate-notify.service at graphical-session.target,
-# which the session can reach before the shell has claimed
+# This runs from omarchy-migrate-notify.service after graphical-session.target,
+# but the target can be reached before the shell has claimed
 # org.freedesktop.Notifications. Without the wait the toast is sent into the
 # void and the user never learns about their pending migrations.
 omarchy-notification-wait || true
diff --git a/default/systemd/user/omarchy-migrate-notify.service b/default/systemd/user/omarchy-migrate-notify.service
index 79207652..c084d785 100644
--- a/default/systemd/user/omarchy-migrate-notify.service
+++ b/default/systemd/user/omarchy-migrate-notify.service
@@ -7,6 +7,10 @@ Description=Notify about pending Omarchy migrations
 # already being applied in the visible update terminal. Checking once per login
 # is the only trigger that cannot collide with a running update.
 ConditionPathIsDirectory=/usr/share/omarchy/migrations
+# The actionable notification launches its terminal through uwsm-app, whose
+# daemon starts after graphical-session.target. Run after the target too so this
+# oneshot cannot hold the target open while waiting for that daemon.
+After=graphical-session.target
 
 [Service]
 Type=oneshot
diff --git a/docs/file-layout.md b/docs/file-layout.md
index 09065807..4f09cab0 100644
--- a/docs/file-layout.md
+++ b/docs/file-layout.md
@@ -198,7 +198,8 @@ appropriate helper or privilege prompt. Migrations must be idempotent;
 machine-wide repairs should no-op when another user already applied them.
 
 Each graphical user has `omarchy-migrate-notify.service`, started once per login
-through `WantedBy=graphical-session.target`. The package also ships
+through `WantedBy=graphical-session.target` and ordered after that target so
+notification actions can safely launch through UWSM. The package also ships
 `omarchy-update-user-notify.service` as a symlink onto it, so users enabled
 under the old unit name keep working before they reach migration `1785095882`.
 It runs `omarchy-migrate-notify` as
diff --git a/docs/migrations.md b/docs/migrations.md
index 7e6d5538..9eb000fa 100644
--- a/docs/migrations.md
+++ b/docs/migrations.md
@@ -45,7 +45,8 @@ all pending migrations for the current user in the visible update terminal.
 
 ### At login
 
-Every graphical login starts `omarchy-migrate-notify.service`, which checks:
+Every graphical login starts `omarchy-migrate-notify.service` after
+`graphical-session.target`. The notifier checks:
 
 ```bash
 omarchy-migrate --pending
diff --git a/docs/update-process.md b/docs/update-process.md
index b12f4f51..fcdda247 100644
--- a/docs/update-process.md
+++ b/docs/update-process.md
@@ -150,7 +150,8 @@ sudo pacman -Syu
   ├─ pre-transaction guard aborts and tells the user to run omarchy update
   └─ if explicitly bypassed, upgrades omarchy and related packages
   └─ at that user's next login
-       ├─ omarchy-migrate-notify.service starts with graphical-session.target
+       ├─ graphical-session.target starts
+       ├─ omarchy-migrate-notify.service starts after it
        ├─ omarchy-migrate-notify checks omarchy-migrate --pending
        ├─ if this user has missing migration state, show notification
        └─ click opens terminal: omarchy-migrate
@@ -173,6 +174,9 @@ Fallbacks:
   migration that repoints it only runs for users who run an update — the
   opposite of who the notifier is for. The alias can be dropped once installs
   have run migration `1785095882`.
+- The notifier is ordered after `graphical-session.target`, so an action that
+  launches through `uwsm-app` cannot block the target that gates UWSM's app
+  daemon.
 - The notifier waits for a live notification server before sending, because
   `graphical-session.target` can be reached before the shell claims
   `org.freedesktop.Notifications`.
diff --git a/test/shell.d/systemd-test.sh b/test/shell.d/systemd-test.sh
index b6346495..af1654d7 100755
--- a/test/shell.d/systemd-test.sh
+++ b/test/shell.d/systemd-test.sh
@@ -37,7 +37,9 @@ pass "no unit watches the migration directory, so package updates cannot trigger
 notify_service="$ROOT/default/systemd/user/omarchy-migrate-notify.service"
 grep -Fx 'ExecStart=/usr/bin/omarchy-migrate-notify' "$notify_service" >/dev/null
 grep -Fx 'WantedBy=graphical-session.target' "$notify_service" >/dev/null
-pass "migration notifier only checks once per login"
+grep -Fx 'After=graphical-session.target' "$notify_service" >/dev/null ||
+  fail "migration notifier can deadlock UWSM by blocking graphical-session.target"
+pass "migration notifier checks once per login after the graphical session is ready"
 
 grep -F 'omarchy-migrate-notify.service' "$first_run_units" >/dev/null ||
   fail "first-run does not enable the login migration notifier"