Fix problems with first time drop down