BHV-10817: Fix handle spotlight behavior