Fix: Cancel button would never cancel