another try at fixing sidebar splitting

this revert some changes and makes another attemp to fix the issue with the sidebar splitting