Fix: close on cancel