Make OnePick modal even on top of ours

Fix CORE-475