diff --git a/erpnext/templates/includes/cart/address_card.html b/erpnext/templates/includes/cart/address_card.html
index 830ed649f5f..a4f10cc643e 100644
--- a/erpnext/templates/includes/cart/address_card.html
+++ b/erpnext/templates/includes/cart/address_card.html
@@ -7,11 +7,11 @@
 		<div class="card-text mb-2">
 			{{ address.display }}
 		</div>
-		<a href="/addresses?name={{address.name}}" class="card-link">
+		<a href="/address/{{address.name}}" class="card-link">
 			<svg class="icon icon-sm">
 				<use href="#icon-edit"></use>
 			</svg>
 			{{ _('Edit') }}
 		</a>
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/erpnext/templates/includes/cart/address_picker_card.html b/erpnext/templates/includes/cart/address_picker_card.html
index 646210e65f1..dd9adad66f2 100644
--- a/erpnext/templates/includes/cart/address_picker_card.html
+++ b/erpnext/templates/includes/cart/address_picker_card.html
@@ -7,6 +7,6 @@
 		<p class="card-text text-muted">
 			{{ address.display }}
 		</p>
-		<a href="/addresses?name={{address.name}}" class="card-link">{{ _('Edit') }}</a>
+		<a href="/address/{{address.name}}" class="card-link">{{ _('Edit') }}</a>
 	</div>
 </div>
diff --git a/erpnext/templates/includes/cart/cart_address.html b/erpnext/templates/includes/cart/cart_address.html
index cf600173731..525a56af1f0 100644
--- a/erpnext/templates/includes/cart/cart_address.html
+++ b/erpnext/templates/includes/cart/cart_address.html
@@ -186,3 +186,80 @@ frappe.ready(() => {
 	}
 });
 </script>
+
+<script>
+	frappe.ready(() => {
+		function get_update_address_dialog() {
+			let d = new frappe.ui.Dialog({
+				title: "Select Address",
+				fields: [{
+					'fieldtype': 'HTML',
+					'fieldname': 'address_picker',
+				}],
+				primary_action_label: __('Set Address'),
+				primary_action: () => {
+					const $card = d.$wrapper.find('.address-card.active');
+					const address_type = $card.closest('[data-address-type]').attr('data-address-type');
+					const address_name = $card.closest('[data-address-name]').attr('data-address-name');
+					frappe.call({
+						type: "POST",
+						method: "erpnext.e_commerce.shopping_cart.cart.update_cart_address",
+						freeze: true,
+						args: {
+							address_type,
+							address_name
+						},
+						callback: function(r) {
+							d.hide();
+							if (!r.exc) {
+								$(".cart-tax-items").html(r.message.total);
+								shopping_cart.parent.find(
+									`.address-container[data-address-type="${address_type}"]`
+								).html(r.message.address);
+							}
+						}
+					});
+				}
+			});
+
+			return d;
+		}
+
+		function get_address_template(type) {
+			return {
+				shipping: `<div class="mb-3" data-section="shipping-address">
+					<div class="row no-gutters" data-fieldname="shipping_address_name">
+						{% for address in shipping_addresses %}
+							<div class="mr-3 mb-3 w-100" data-address-name="{{address.name}}" data-address-type="shipping"
+								{% if doc.shipping_address_name == address.name %} data-active {% endif %}>
+								{% include "templates/includes/cart/address_picker_card.html" %}
+							</div>
+						{% endfor %}
+					</div>
+				</div>`,
+				billing: `<div class="mb-3" data-section="billing-address">
+					<div class="row no-gutters" data-fieldname="customer_address">
+						{% for address in billing_addresses %}
+							<div class="mr-3 mb-3 w-100" data-address-name="{{address.name}}" data-address-type="billing"
+								{% if doc.shipping_address_name == address.name %} data-active {% endif %}>
+								{% include "templates/includes/cart/address_picker_card.html" %}
+							</div>
+						{% endfor %}
+					</div>
+				</div>`,
+			}[type];
+		}
+
+		$(document).find('.btn-change-address').click(function(e) {
+			debugger
+			const d = get_update_address_dialog();
+			const type = $(e.currentTarget).parents('.address-container').attr('data-address-type');
+
+			$(d.get_field('address_picker').wrapper).html(
+				get_address_template(type)
+			);
+
+			d.show();
+		});
+	});
+</script>
\ No newline at end of file
diff --git a/erpnext/templates/pages/cart.js b/erpnext/templates/pages/cart.js
index fb2d159dcf9..1cf8a1a28e8 100644
--- a/erpnext/templates/pages/cart.js
+++ b/erpnext/templates/pages/cart.js
@@ -12,7 +12,6 @@ $.extend(shopping_cart, {
 	},
 
 	bind_events: function() {
-		shopping_cart.bind_address_picker_dialog();
 		shopping_cart.bind_place_order();
 		shopping_cart.bind_request_quotation();
 		shopping_cart.bind_change_qty();
@@ -21,78 +20,6 @@ $.extend(shopping_cart, {
 		shopping_cart.bind_coupon_code();
 	},
 
-	bind_address_picker_dialog: function() {
-		const d = this.get_update_address_dialog();
-		this.parent.find('.btn-change-address').on('click', (e) => {
-			const type = $(e.currentTarget).parents('.address-container').attr('data-address-type');
-			$(d.get_field('address_picker').wrapper).html(
-				this.get_address_template(type)
-			);
-			d.show();
-		});
-	},
-
-	get_update_address_dialog() {
-		let d = new frappe.ui.Dialog({
-			title: "Select Address",
-			fields: [{
-				'fieldtype': 'HTML',
-				'fieldname': 'address_picker',
-			}],
-			primary_action_label: __('Set Address'),
-			primary_action: () => {
-				const $card = d.$wrapper.find('.address-card.active');
-				const address_type = $card.closest('[data-address-type]').attr('data-address-type');
-				const address_name = $card.closest('[data-address-name]').attr('data-address-name');
-				frappe.call({
-					type: "POST",
-					method: "erpnext.e_commerce.shopping_cart.cart.update_cart_address",
-					freeze: true,
-					args: {
-						address_type,
-						address_name
-					},
-					callback: function(r) {
-						d.hide();
-						if (!r.exc) {
-							$(".cart-tax-items").html(r.message.total);
-							shopping_cart.parent.find(
-								`.address-container[data-address-type="${address_type}"]`
-							).html(r.message.address);
-						}
-					}
-				});
-			}
-		});
-
-		return d;
-	},
-
-	get_address_template(type) {
-		return {
-			shipping: `<div class="mb-3" data-section="shipping-address">
-				<div class="row no-gutters" data-fieldname="shipping_address_name">
-					{% for address in shipping_addresses %}
-						<div class="mr-3 mb-3 w-100" data-address-name="{{address.name}}" data-address-type="shipping"
-							{% if doc.shipping_address_name == address.name %} data-active {% endif %}>
-							{% include "templates/includes/cart/address_picker_card.html" %}
-						</div>
-					{% endfor %}
-				</div>
-			</div>`,
-			billing: `<div class="mb-3" data-section="billing-address">
-				<div class="row no-gutters" data-fieldname="customer_address">
-					{% for address in billing_addresses %}
-						<div class="mr-3 mb-3 w-100" data-address-name="{{address.name}}" data-address-type="billing"
-							{% if doc.shipping_address_name == address.name %} data-active {% endif %}>
-							{% include "templates/includes/cart/address_picker_card.html" %}
-						</div>
-					{% endfor %}
-				</div>
-			</div>`,
-		}[type];
-	},
-
 	bind_place_order: function() {
 		$(".btn-place-order").on("click", function() {
 			shopping_cart.place_order(this);