Maintain correct panel focus on closing component