Fix Issue: Better event delegation to popup forms, no/cancel button click closes the popup