Fix handling of focus/click on buttons