diff --git a/.claude/skills/agent-device/flows/macros/web/complete-onboarding.ad b/.claude/skills/agent-device/flows/macros/web/complete-onboarding.ad
index 227bcd65cabd..f21ea5989b2a 100644
--- a/.claude/skills/agent-device/flows/macros/web/complete-onboarding.ad
+++ b/.claude/skills/agent-device/flows/macros/web/complete-onboarding.ad
@@ -5,9 +5,14 @@ context platform=web
 # @post   role="button" label="Search"
 # @param  FIRST_NAME First name to enter on onboarding profile step.
 # @param  LAST_NAME Last name to enter on onboarding profile step.
+# @param  VIEWPORT_WIDTH Web viewport width in pixels. Optional.
+# @param  VIEWPORT_HEIGHT Web viewport height in pixels. Optional.
 
 press "role=\"button\" label=\"Skip\" || label=\"Skip\""
+viewport ${VIEWPORT_WIDTH:-1920} ${VIEWPORT_HEIGHT:-1080}
+wait "role=\"button\" label=\"Something else\"" 15000
 press "role=\"button\" label=\"Something else\" || label=\"Something else\""
+wait "role=\"textbox\" label=\"First name\"" 15000
 fill "role=\"textbox\" label=\"First name\" || label=\"First name\"" "${FIRST_NAME}"
 fill "role=\"textbox\" label=\"Last name\" || label=\"Last name\"" "${LAST_NAME}"
 press "role=\"button\" label=\"Continue\" || label=\"Continue\""