#108, fix event from popup firing initially and causing mayhem