If you don't like the current way then bind to disabled instead of using on_disabled, however we still need to make sure the existing features aren't removed.