I'd just insert an Action Button. Not perfect 100%, but works reliably

Capture.JPG