CORE-557 Make sure save&close don't trigger when button is disabled
Merge pull request #2038 from reciprocity/hotfix/CORE-557

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