Fix for sidebar drawing issues