Porting projectblacklight/blacklight@6fa1a14 .  display in modal better