diff --git a/modules/payment/includes/commerce_payment.checkout_pane.inc b/modules/payment/includes/commerce_payment.checkout_pane.inc
index 9dc2d4c..fb73034 100644
--- a/modules/payment/includes/commerce_payment.checkout_pane.inc
+++ b/modules/payment/includes/commerce_payment.checkout_pane.inc
@@ -84,6 +84,9 @@ function commerce_payment_pane_checkout_form($form, &$form_state, $checkout_pane
     if (isset($pane_values['payment_method']) && isset($options[$pane_values['payment_method']])) {
       $default_value = $pane_values['payment_method'];
     }
+    elseif (isset($form_state['input']['commerce_payment']['payment_method'])) {
+      $default_value = $form_state['complete form']['commerce_payment']['payment_method']['#default_value'];
+    }
     elseif (isset($order->data['payment_method']) && isset($options[$order->data['payment_method']])) {
       $default_value = $order->data['payment_method'];
     }