The block names are not very consistent. How about CancelClosePopup and UndoClosePopup?