diff --git a/erpnext/templates/includes/cart.js b/erpnext/templates/includes/cart.js
index dbb93a9..93b5ae0 100644
--- a/erpnext/templates/includes/cart.js
+++ b/erpnext/templates/includes/cart.js
@@ -24,6 +24,16 @@
 			if($(this).prop("checked")) {
 				var me = this;
 
+				// freeze ui and wait for response:
+				frappe.freeze();
+
+				// uncheck other shipping or billing addresses:
+				if ( $(this).is('input[data-fieldname=customer_address]') ) {
+					$('input[data-fieldname=customer_address]').not(this).prop('checked', false);
+				} else {
+					$('input[data-fieldname=shipping_address_name]').not(this).prop('checked', false);
+				}
+
 				return frappe.call({
 					type: "POST",
 					method: "erpnext.shopping_cart.cart.update_cart_address",
@@ -35,6 +45,8 @@
 						if(!r.exc) {
 							$(".cart-tax-items").html(r.message.taxes);
 						}
+						// unfreeze:
+						frappe.unfreeze();
 					}
 				});
 			} else {