Comment 4 for bug 1813119

Finally got there. Although ran out of time to think about a general redesign that could be upstreamed. Instead I've just proposed a fix specific to disco:

https://code.launchpad.net/~vanvugt/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/363831