diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php
index aab529c9..f56d9d42 100644
--- a/app/Views/client_branch.php
+++ b/app/Views/client_branch.php
@@ -23,7 +23,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index 116003ea..da2344f3 100644
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -158,7 +158,9 @@ body {
             $('#BtnAdd').hide();
             toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
         }else{
-            $('#BtnAdd').show();
+            if ($('#btnPolicyBack')[0].style.display == 'none') {
+                $('#BtnAdd').show();
+            }
         }
         
     }
@@ -171,7 +173,9 @@ body {
             $('#btnBranchAdd').hide();
             toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
         }else{
-            $('#btnBranchAdd').show();
+            if ($('#btnBranchBack')[0].style.display == 'none') {
+                $('#btnBranchAdd').show();
+            }
         }
         
     }
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 0237392b..9018586c 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -28,7 +28,7 @@
             <div class="card-body">
                 
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack btn-sm"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnPolicyBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack btn-sm"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/insurer_branch.php b/app/Views/insurer_branch.php
index e2739700..8170f321 100644
--- a/app/Views/insurer_branch.php
+++ b/app/Views/insurer_branch.php
@@ -23,7 +23,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/insurer_onboarding.php b/app/Views/insurer_onboarding.php
index 53c2f080..f7520d25 100644
--- a/app/Views/insurer_onboarding.php
+++ b/app/Views/insurer_onboarding.php
@@ -79,7 +79,9 @@ body {
             $('#btnBranchAdd').hide();
             toastr.warning('First Add the Insurer!', 'warning',{timeOut: 2000});
         }else{
-            $('#btnBranchAdd').show();
+            if ($('#btnBranchBack')[0].style.display == 'none') {
+                $('#btnBranchAdd').show();
+            }
         }
     }
 
diff --git a/app/Views/kyc_docs.php b/app/Views/kyc_docs.php
index d27ae100..0ec33c05 100644
--- a/app/Views/kyc_docs.php
+++ b/app/Views/kyc_docs.php
@@ -22,7 +22,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/kyc_onboarding.php b/app/Views/kyc_onboarding.php
index 531f86e7..0db36ce1 100644
--- a/app/Views/kyc_onboarding.php
+++ b/app/Views/kyc_onboarding.php
@@ -77,7 +77,9 @@ body {
             $('#btnBranchAdd').hide();
             toastr.warning('First Add the KYC Entity Type!', 'warning',{timeOut: 2000});
         }else{
-            $('#btnBranchAdd').show();
+            if ($('#btnBranchBack')[0].style.display == 'none') {
+                $('#btnBranchAdd').show();
+            }
         }
         
     }
diff --git a/app/Views/policies.php b/app/Views/policies.php
index 59a7eba9..83560c37 100644
--- a/app/Views/policies.php
+++ b/app/Views/policies.php
@@ -23,7 +23,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/policy_type_onboarding.php b/app/Views/policy_type_onboarding.php
index 4d6d9c39..f1c3075d 100644
--- a/app/Views/policy_type_onboarding.php
+++ b/app/Views/policy_type_onboarding.php
@@ -76,7 +76,9 @@ body {
             $('#btnBranchAdd').hide();
             toastr.warning('First Add the Policy Type!', 'warning',{timeOut: 2000});
         }else{
-            $('#btnBranchAdd').show();
+            if ($('#btnBranchBack')[0].style.display == 'none') {
+                $('#btnBranchAdd').show();
+            }
         }
         
     }
diff --git a/app/Views/tpa_branch.php b/app/Views/tpa_branch.php
index f098fe6c..5104ae67 100644
--- a/app/Views/tpa_branch.php
+++ b/app/Views/tpa_branch.php
@@ -23,7 +23,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/tpa_onboarding.php b/app/Views/tpa_onboarding.php
index ce73876c..1e14dabe 100644
--- a/app/Views/tpa_onboarding.php
+++ b/app/Views/tpa_onboarding.php
@@ -70,13 +70,15 @@ body {
 <script>
     function tpa_branch_contact() {
         var check_tpa_id = $('#tpa_General_PrimaryKey');
-        
+
 
         if(check_tpa_id[0].value == '' || check_tpa_id[0].value == null || check_tpa_id[0].value == 0){
             $('#btnBranchAdd').hide();
             toastr.warning('First Add the TPA!', 'warning',{timeOut: 2000});
         }else{
-            $('#btnBranchAdd').show();
+            if ($('#btnBranchBack')[0].style.display == 'none') {
+                $('#btnBranchAdd').show();
+            }
         }
         
     }