Fixing boundary popups