When the xref buffer appears (typically for generic functions or ones with compiler macros), exiting it through either the 'q' key or space bar breaks the window layout.

If I have 2 windows, each with a buffer, exiting the xref buffer leaves only one of them, being the window from which meta-point was pressed. Ideally, it would notice when it replaced a window and make it appear again.