diff --git a/lib/WebGUI/Shop/Cart.pm b/lib/WebGUI/Shop/Cart.pm
index bfe7d3b33..95b7a0836 100644
--- a/lib/WebGUI/Shop/Cart.pm
+++ b/lib/WebGUI/Shop/Cart.pm
@@ -1005,7 +1005,10 @@ sub www_view {
         my $billingAddressData  = $self->get('billingAddressId')  ? $self->getBillingAddress->get()  : {};
         $addressBook->appendAddressFormVars(\%var, 'shipping_', $shippingAddressData);
         $addressBook->appendAddressFormVars(\%var, 'billing_',  $billingAddressData);
-        $var{sameShippingAsBilling} = WebGUI::Form::yesNo($session, {name => 'sameShippingAsBilling', value => $form->get('sameShippingAsBilling','yesNo')});
+        $var{sameShippingAsBilling} = WebGUI::Form::yesNo($session, {
+            name => 'sameShippingAsBilling',
+            value => $self->get('billingAddressId') && $self->get('billingAddressId') eq $self->get('shippingAddressId'),
+        });
     }
 
     # POS variables