[#979984] Fixes to resize of popup