Fix bug where opening Date picker would always select the first date even if already set