Fix regression in Calendar popup