diff --git a/resources/views/accounts/templates_and_reminders.blade.php b/resources/views/accounts/templates_and_reminders.blade.php
index 7c27c381ff9f..84770e697c67 100644
--- a/resources/views/accounts/templates_and_reminders.blade.php
+++ b/resources/views/accounts/templates_and_reminders.blade.php
@@ -161,7 +161,8 @@
                     var idName = '#email_' + stringType + '_' + entityType;
                     var value = $(idName).val();
                     var previewName = '#' + entityType + '_' + stringType + '_preview';
-                    $(previewName).html(renderEmailTemplate(value));
+                    var isQuote = entityType == "{{ ENTITY_QUOTE }}";
+                    $(previewName).html(renderEmailTemplate(value, false, isQuote));
                 }
             }
         }
diff --git a/resources/views/partials/email_templates.blade.php b/resources/views/partials/email_templates.blade.php
index 206c69a652d9..5278e6742df1 100644
--- a/resources/views/partials/email_templates.blade.php
+++ b/resources/views/partials/email_templates.blade.php
@@ -1,6 +1,6 @@
 <script type="text/javascript">
 
-    function renderEmailTemplate(str, invoice) {
+    function renderEmailTemplate(str, invoice, isQuote) {
         if (!str) {
             return '';
         }
@@ -30,7 +30,7 @@
             'password': passwordHtml,
             'documents': documentsHtml,
             'viewLink': '{{ link_to('#', url('/view/...')) }}$password',
-            'viewButton': invoice && invoice.invoice_type_id == {{ INVOICE_TYPE_QUOTE }} ?
+            'viewButton': isQuote || (invoice && invoice.invoice_type_id == {{ INVOICE_TYPE_QUOTE }}) ?
                 '{!! Form::flatButton('view_quote', '#0b4d78') !!}$password' :
                 '{!! Form::flatButton('view_invoice', '#0b4d78') !!}$password',
             'paymentLink': '{{ link_to('#', url('/payment/...')) }}$password',