For mac users there's ChitChat[0], it behaves as expected. In fact I'm not switching to the official WhatsApp desktop release until this issue is properly fixed.

[0] https://github.com/stonesam92/ChitChat