Fix duplicated code for popup/noti callback