Fix bug where disabled buttons become active