DAR-2604, make close button mandatory