diff --git a/public/js/clients/quotes/approve.js b/public/js/clients/quotes/approve.js
index 3d634ca303be..8cd94e851adb 100644
--- a/public/js/clients/quotes/approve.js
+++ b/public/js/clients/quotes/approve.js
@@ -70,6 +70,10 @@ var Approve = /*#__PURE__*/function () {
         var approveButton = document.getElementById("approve-button");
         if (approveButton) approveButton.disabled = false;
       });
+      document.getElementById("hide_close").addEventListener('click', function () {
+        var approveButton = document.getElementById("approve-button");
+        if (approveButton) approveButton.disabled = false;
+      });
       document.getElementById('approve-button').addEventListener('click', function () {
         if (!_this.shouldDisplaySignature && !_this.shouldDisplayTerms && _this.shouldDisplayUserInput) {
           _this.displayInput();
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 8a4bcd6428a8..ab1a01984236 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -14,7 +14,7 @@
     "/js/clients/payments/stripe-alipay.js": "/js/clients/payments/stripe-alipay.js?id=018ecad3a1bcc1ecc47f76754a573ff2",
     "/js/clients/payments/checkout-credit-card.js": "/js/clients/payments/checkout-credit-card.js?id=7cb96275b3eb4901054564c654fb60e3",
     "/js/clients/quotes/action-selectors.js": "/js/clients/quotes/action-selectors.js?id=3a4c5cfac7dd4c9218be55945c3c8e85",
-    "/js/clients/quotes/approve.js": "/js/clients/quotes/approve.js?id=621dd5745e74c9fc5d255a77f4cfab74",
+    "/js/clients/quotes/approve.js": "/js/clients/quotes/approve.js?id=1474ce4457835874ef2e540e3a1da7eb",
     "/js/clients/payments/stripe-credit-card.js": "/js/clients/payments/stripe-credit-card.js?id=6e7c8ab039a239727317ae8622de10db",
     "/js/setup/setup.js": "/js/setup/setup.js?id=8cab3339ef48418e1fb2e7a9259d51ca",
     "/js/clients/payments/card-js.min.js": "/js/clients/payments/card-js.min.js?id=cf50b5ba1fcd1d184bf0c10d710672c8",
diff --git a/resources/js/clients/quotes/approve.js b/resources/js/clients/quotes/approve.js
index f872020cc96e..4b38a3c3c291 100644
--- a/resources/js/clients/quotes/approve.js
+++ b/resources/js/clients/quotes/approve.js
@@ -54,6 +54,7 @@ class Approve {
     handle() {
 
         document.getElementById("signature-next-step").disabled = true;
+
         document.getElementById("close_button").addEventListener('click', () => {
             const approveButton = document.getElementById("approve-button");
 
@@ -62,6 +63,14 @@ class Approve {
 
         });
 
+        document.getElementById("hide_close").addEventListener('click', () => {
+            const approveButton = document.getElementById("approve-button");
+
+            if(approveButton)
+                approveButton.disabled = false;
+
+        });
+
         document
             .getElementById('approve-button')
             .addEventListener('click', () => {
diff --git a/resources/views/portal/ninja2020/invoices/includes/signature.blade.php b/resources/views/portal/ninja2020/invoices/includes/signature.blade.php
index 88fcf9dc7a8e..eaa17d80e736 100644
--- a/resources/views/portal/ninja2020/invoices/includes/signature.blade.php
+++ b/resources/views/portal/ninja2020/invoices/includes/signature.blade.php
@@ -27,8 +27,8 @@
                     {{ ctrans('texts.next_step') }}
                 </button>
             </div>
-            <div class="mt-3 flex w-full rounded-md shadow-sm sm:mt-0 sm:w-auto">
-                <button id="close_button" onclick="document.getElementById('displaySignatureModal').style.display = 'none'; return true;" type="button" class="button button-secondary">
+            <div class="mt-3 flex w-full rounded-md shadow-sm sm:mt-0 sm:w-auto" id="close_button">
+                <button @click="document.getElementById('displaySignatureModal').style.display = 'none';" type="button" class="button button-secondary">
                     {{ ctrans('texts.close') }}
                 </button>
             </div>
diff --git a/resources/views/portal/ninja2020/quotes/includes/user-input.blade.php b/resources/views/portal/ninja2020/quotes/includes/user-input.blade.php
index fe1ea748609f..afafe6d6863f 100644
--- a/resources/views/portal/ninja2020/quotes/includes/user-input.blade.php
+++ b/resources/views/portal/ninja2020/quotes/includes/user-input.blade.php
@@ -23,11 +23,6 @@
                 </button>
 
             </div>
-            <div class="mt-3 flex w-full rounded-md shadow-sm sm:mt-0 sm:w-auto" id="close_button">
-                <button @click="document.getElementById('displayInputModal').style.display = 'none';" type="button" class="button button-secondary">
-                    {{ ctrans('texts.close') }}
-                </button>
-            </div>
         </div>
     </div>
 </div>
diff --git a/resources/views/portal/ninja2020/quotes/show.blade.php b/resources/views/portal/ninja2020/quotes/show.blade.php
index 4a74e1f65e32..3e297cb4d03b 100644
--- a/resources/views/portal/ninja2020/quotes/show.blade.php
+++ b/resources/views/portal/ninja2020/quotes/show.blade.php
@@ -110,7 +110,6 @@
     @include('portal.ninja2020.invoices.includes.terms', ['entities' => [$quote], 'entity_type' => ctrans('texts.quote')])
     @include('portal.ninja2020.invoices.includes.signature')
     @include('portal.ninja2020.quotes.includes.user-input')
-
 @endsection
 
 @section('footer')