Fixes issue where currentButtonType was not being updated