Bug/446/popup-border