Better z-index fix than the previous commit.