Tweak CollapsibleSectionPanel to focus the right component in all circumstances.