diff --git a/.maestro/subflows/tap-notification.yaml b/.maestro/subflows/tap-notification.yaml
index 823388ee..f72069dc 100644
--- a/.maestro/subflows/tap-notification.yaml
+++ b/.maestro/subflows/tap-notification.yaml
@@ -1,16 +1,18 @@
-# Tap the notification matching TEXT: the banner while it shows, else the
-# entry in Notification Center (pulled down from the top left).
+# Tap the notification matching TEXT in Notification Center. The banner
+# goes away after a few seconds, often between Maestro finding it and
+# tapping it (the tap then lands on whatever is below): wait until it is
+# gone, pull Notification Center down from the top left, and tap there.
 appId: org.bulwarkmail.mobile
 ---
-- runFlow:
-    when:
-      notVisible: ${TEXT}
-    commands:
-      - swipe:
-          start: 20%,1%
-          end: 20%,60%
-          duration: 500
-      - extendedWaitUntil:
-          visible: ${TEXT}
-          timeout: 10000
+- extendedWaitUntil:
+    notVisible: ${TEXT}
+    timeout: 15000
+    optional: true
+- swipe:
+    start: 20%,1%
+    end: 20%,60%
+    duration: 500
+- extendedWaitUntil:
+    visible: ${TEXT}
+    timeout: 10000
 - tapOn: ${TEXT}