Pop up now works correctly with New Night button.