Unable to create a new company shipping address in PO

I am unable to create a new Company shipping address in PO. While creating a new address, it saves as the Supplier address. As a workaround, creating the address first in Company and then selecting the same in PO. Any help?