Fixed regression for clearing theme menu when making a selection