diff --git a/resources/views/Shop/Customers/partials/addresses.blade.php b/resources/views/Shop/Customers/partials/addresses.blade.php
index a5adc0da..59f5eefa 100644
--- a/resources/views/Shop/Customers/partials/addresses.blade.php
+++ b/resources/views/Shop/Customers/partials/addresses.blade.php
@@ -48,13 +48,20 @@
             var $list = $('#addresses_list_{{ $prefix }}');
             var storeUrl = '{{ route('Shop.Customers.address.store') }}';
 
-        $('#add_address_{{ $prefix }}').on('click', function() {
-            $formContainer.toggleClass('d-none');
+        var $toggleBtn = $('#add_address_{{ $prefix }}');
+
+        $toggleBtn.on('click', function() {
+            var isHidden = $formContainer.hasClass('d-none');
+            if (isHidden) {
+                $formContainer.removeClass('d-none');
+                $toggleBtn.prop('disabled', true);
+            }
         });
 
         $('#cancel_address_{{ $prefix }}').on('click', function() {
             $formContainer.addClass('d-none');
             $formContainer.find('input[type="text"]').val('');
+            $toggleBtn.prop('disabled', false);
         });
 
         $('#save_address_{{ $prefix }}').on('click', function() {
@@ -69,6 +76,7 @@
                     }
                     $formContainer.addClass('d-none');
                     $formContainer.find('input[type="text"]').val('');
+                    $toggleBtn.prop('disabled', false);
                     if (response.id) {
                         const $newRadio = $list.find('#address_' + response.id);
                         $list.find('input[type="radio"]').not($newRadio).prop('checked', false);