WIKI-426 Too much blank space on the space-switcher.