No dispute integration is nice, but it is not working properly from what my parent comment was saying.
Your options are to wait for it to improve, fix it yourself, or change your tools/workflow.
Some people seem to have had an allergic reaction to my comment. Maybe it's the emacs mention, which was tongue in cheek. Oh well ¯\_(ツ)_/¯ I'll leave it as it is... for this is a righteous battle!