change button event flow a bit