24437 - using the z-index calculation

There is a flag in the modal that allows the z-index to be computed and
I added a +1/-1 to the results to (hopefully) force the overlay to be
under the popup.