Thanks for the tip. Didn't know Bitcoin Wallet could do that. However last I heard Bitcoin Wallet doesn't support encryption of the private keys, HD Wallets or watch-only addresses. But good to know in case they fix those things in future updates.
I was planning to connect to my node through my VPN, so no issues there.