Misc fixes for sidebar selection behavior