RF-13087, RF-13010: Original fix, now including a parent popupPanel check