fixed calendar popup on new and edit stay