Merge pull request #3383 from MartB/modal-heightfix