Agree with the OP this is a bit of a nuisance.