Increase the z-index to fix issue #1080