BHV-1120: Retain spotlight focus using panels within drawers