Added additional check for base view sidebar