Fix weird repat/random button behavior