Fixed combined edit/delete with cancel