#7 popup button bug fix