Modifications to the new Close On Exit option: