Small improvement to control button handling