diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index f08f6b167..07c8be53b 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -76,7 +76,6 @@ const app = new Vue({
                 ',,'
             ],
             email_template: false,
-            minor_form_loading: false
         }
     },
 
@@ -662,11 +661,13 @@ const app = new Vue({
 
                                     if (response.data.error) {
                                         this.form.loading = false;
+
                                         this.form.response = response.data;
                                     }
                                 })
                                 .catch(error => {
                                     this.form.loading = false;
+
                                     this.form.onFail(error);
 
                                     this.method_show_html = error.message;
@@ -945,7 +946,7 @@ const app = new Vue({
            let form_html = document.querySelector('form');
            
            if (form_html && form_html.getAttribute('id') == 'document') {
-               form_html.querySelectorAll('input, textarea, select, ul, li, a').forEach((element) => {
+               form_html.querySelectorAll('input, textarea, select, ul, li, a, [type="button"]').forEach((element) => {
                   element.addEventListener('click', () => {
                       this.onBeforeUnload();
                   });
@@ -969,18 +970,7 @@ const app = new Vue({
         onSubmitViaSendEmail() {
             this.form['senddocument'] = true;
 
-            this.minor_form_loading = true;
-
             this.onSubmit();
-
-            this.form.loading = false;
-
-            setTimeout(() => {
-                if (Object.keys(this.form.errors.errors.length > 0)) {
-                    this.minor_form_loading = false;
-                    return;
-                }
-            }, 200);
         },
     },
 
@@ -1120,6 +1110,6 @@ const app = new Vue({
             }
 
             this.form.discount = this.form.discount.replace(',', '.');
-        }
+        },
     },
-});
+});
\ No newline at end of file
diff --git a/resources/views/components/documents/form/buttons.blade.php b/resources/views/components/documents/form/buttons.blade.php
index d8d77b63c..b886223d4 100644
--- a/resources/views/components/documents/form/buttons.blade.php
+++ b/resources/views/components/documents/form/buttons.blade.php
@@ -8,15 +8,15 @@
                 id="invoice-send-to"
                 class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 ltr:ml-2 rtl:mr-2 text-base rounded-lg disabled:bg-green-100"
                 override="class"
-                ::disabled="minor_form_loading"
+                ::disabled="form.loading"
                 @click="onSubmitViaSendEmail"
             >
-                <i v-if="minor_form_loading" class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:-left-3.5 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:-right-3.5 after:rounded-full after:animate-submit after:delay-[0.42s]"></i>
-                <span :class="[{'opacity-0': minor_form_loading}]">
+                <i v-if="form.loading" class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:-left-3.5 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:-right-3.5 after:rounded-full after:animate-submit after:delay-[0.42s]"></i>
+                <span :class="[{'opacity-0': form.loading}]">
                     {{ trans('general.send_to') }}
                 </span>
             </x-button>
             @endif
         </div>
     </x-slot>
-</x-form.section>
+</x-form.section>
\ No newline at end of file
diff --git a/resources/views/portal/invoices/preview.blade.php b/resources/views/portal/invoices/preview.blade.php
index a118bbc62..545fec7b7 100644
--- a/resources/views/portal/invoices/preview.blade.php
+++ b/resources/views/portal/invoices/preview.blade.php
@@ -27,7 +27,7 @@
                         <div role="tablist" class="flex flex-wrap">
                             @php $is_active = true; @endphp
 
-                            <div class="swiper swiper-links w-full">
+                            <div class="swiper swiper-links">
                                 <div class="swiper-wrapper">
                                     @foreach ($payment_methods as $key => $name)
                                         @stack('invoice_{{ $key }}_tab_start')
@@ -148,4 +148,4 @@
     @endpush
 
     <x-script folder="portal" file="apps" />
-</x-layouts.preview>
+</x-layouts.preview>
\ No newline at end of file
diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php
index 2d6024d6f..db05f9b8d 100644
--- a/resources/views/portal/invoices/signed.blade.php
+++ b/resources/views/portal/invoices/signed.blade.php
@@ -34,7 +34,7 @@
                             <div role="tablist" class="flex flex-wrap">
                                 @php $is_active = true; @endphp
 
-                                <div class="swiper swiper-links w-full">
+                                <div class="swiper swiper-links">
                                     <div class="swiper-wrapper">
                                         @foreach ($payment_methods as $key => $name)
                                             @stack('invoice_{{ $key }}_tab_start')
@@ -148,4 +148,4 @@
 
         <x-script folder="portal" file="apps" />
     </x-layouts.signed>
-</div>
+</div>
\ No newline at end of file