CORE-557 Make sure save&close don't trigger when button is disabled