Fix for #MCKIN-1476: z-index issue with popup

please see comments in ticket for more details.