Fix issue where scopes are not reset when the drop down is closed