An easy ui fix, but misses that they separate the concept of spaces and channels entirely. You can essentially join a server's text channel without being a member of their server depending on permissions. The UI has ended up created from a user POV rather than being server-based because of this perspective. That being the case I doubt it will change.
Stopping them moving would still be better though