Base: Fix popup positioning