diff --git a/agent/invoice.php b/agent/invoice.php
index ecb871cc..d6826bba 100644
--- a/agent/invoice.php
+++ b/agent/invoice.php
@@ -277,7 +277,8 @@ if (isset($_GET['invoice_id'])) {
                                     data-modal-url="modals/invoice/invoice_copy.php?id=<?= $invoice_id ?>">
                                     <i class="fa fa-fw fa-copy text-secondary mr-2"></i>Copy
                                 </a>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceRecurringModal<?php echo $invoice_id; ?>">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/invoice/invoice_recurring_add.php?invoice_id=<?= $invoice_id ?>">
                                     <i class="fa fa-fw fa-sync-alt text-secondary mr-2"></i>Recurring
                                 </a>
                                 <div class="dropdown-divider"></div>
@@ -725,7 +726,6 @@ if (isset($_GET['invoice_id'])) {
         </div>
     <?php
     include_once "modals/invoice/invoice_add_ticket.php";
-    include_once "modals/invoice/invoice_recurring_add.php";
     include_once "modals/invoice/invoice_note.php";
 
 }
diff --git a/agent/modals/invoice/invoice_recurring_add.php b/agent/modals/invoice/invoice_recurring_add.php
index e8ab7a82..2f49d5ba 100644
--- a/agent/modals/invoice/invoice_recurring_add.php
+++ b/agent/modals/invoice/invoice_recurring_add.php
@@ -1,36 +1,46 @@
-<div class="modal" id="addInvoiceRecurringModal<?php echo $invoice_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fas fa-fw fa-copy mr-2"></i>Make <?php echo "$invoice_prefix$invoice_number"; ?> Recurring</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>"> 
-        <div class="modal-body">
-          
-          <div class="form-group">
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$invoice_id = intval($_GET['invoice_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_id = $invoice_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$invoice_prefix = nullable_htmlentities($row['invoice_prefix']);
+$invoice_number = intval($row['invoice_number']);
+
+ob_start();
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-copy mr-2"></i>Invoice <?= "$invoice_prefix$invoice_number" ?> to Recurring Invoice</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="invoice_id" value="<?= $invoice_id ?>">
+    <div class="modal-body">
+        <div class="form-group">
             <label>Frequency <strong class="text-danger">*</strong></label>
             <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-              </div>
-              <select class="form-control select2" name="frequency" required>
-                <option value="">- Frequency -</option>
-                <option value="month">Monthly</option>
-                <option value="year">Yearly</option>
-              </select>
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                </div>
+                <select class="form-control select2" name="frequency" required>
+                    <option value="">- Frequency -</option>
+                    <option value="month">Monthly</option>
+                    <option value="year">Yearly</option>
+                </select>
             </div>
-          </div>
-        
         </div>
-        <div class="modal-footer">
-          <button type="submit" name="add_invoice_recurring" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create Recurring Invoice</button>
-          <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+    <div class="modal-footer">
+        <button type="submit" name="add_invoice_recurring" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create Recurring Invoice</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';