Payment Surcharge

Is it possible to disable the surcharge until the customer selects a payment method? I have PayPal surcharges configured, I have a total of 3 payment methods and PayPal is the only method that has a surcharge but when a customer adds an item to their cart the PayPal surcharge is added before they reach the section to select a payment method, so if they view their cart it shows a surcharge added.