Prevent the popup form body from overlapping the modal window (see #6825)