diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 593bfe8d4f65..ef87f90749ad 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -101,6 +101,7 @@ class InvoiceController extends BaseController
             $entityType = $clone == INVOICE_TYPE_STANDARD ? ENTITY_INVOICE : ENTITY_QUOTE;
             $invoice->id = $invoice->public_id = null;
             $invoice->is_public = false;
+            $invoice->is_recurring = $invoice->is_recurring && $clone == INVOICE_TYPE_STANDARD;
             $invoice->invoice_type_id = $clone;
             $invoice->invoice_number = $account->getNextNumber($invoice);
             $invoice->due_date = null;
diff --git a/app/Ninja/Datatables/RecurringInvoiceDatatable.php b/app/Ninja/Datatables/RecurringInvoiceDatatable.php
index a7d20ad355a8..df434b11902f 100644
--- a/app/Ninja/Datatables/RecurringInvoiceDatatable.php
+++ b/app/Ninja/Datatables/RecurringInvoiceDatatable.php
@@ -105,7 +105,7 @@ class RecurringInvoiceDatatable extends EntityDatatable
                 },
             ],
             [
-                trans('texts.clone_invoice'),
+                trans("texts.clone_invoice"),
                 function ($model) {
                     return URL::to("invoices/{$model->public_id}/clone");
                 },
@@ -113,6 +113,15 @@ class RecurringInvoiceDatatable extends EntityDatatable
                     return Auth::user()->can('create', ENTITY_INVOICE);
                 },
             ],
+            [
+                trans("texts.clone_quote"),
+                function ($model) {
+                    return URL::to("quotes/{$model->public_id}/clone");
+                },
+                function ($model) {
+                    return Auth::user()->can('create', ENTITY_QUOTE);
+                },
+            ],
 
         ];
     }