diff --git a/resources/views/accounts/template.blade.php b/resources/views/accounts/template.blade.php
index 68279299f607..629b582d8e3a 100644
--- a/resources/views/accounts/template.blade.php
+++ b/resources/views/accounts/template.blade.php
@@ -14,7 +14,7 @@
                                 Former::input('num_days_' . $field)
                                     ->addClass('enable-' . $field)
                                     ->style('float:left;width:20%')
-                                    ->raw() . 
+                                    ->raw() .
                                 Former::select('direction_' . $field)
                                     ->addOption(trans('texts.days_before'), REMINDER_DIRECTION_BEFORE)
                                     ->addOption(trans('texts.days_after'), REMINDER_DIRECTION_AFTER)
@@ -64,10 +64,10 @@
         </div>
         <p>&nbsp;<p/>
         <div class="row">
-            <div class="col-md-10">
+            <div class="col-md-10 show-when-ready" style="display:none">
                 @include('partials/quill_toolbar', ['name' => $field])
             </div>
-            <div class="col-md-2" style="padding-top:10px">
+            <div class="col-md-2 pull-right" style="padding-top:10px">
                 {!! Button::primary(trans('texts.preview'))->withAttributes(['onclick' => 'serverPreview("'.$field.'")'])->small() !!}
             </div>
         </div>
@@ -107,4 +107,4 @@
 
 
 
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/accounts/templates_and_reminders.blade.php b/resources/views/accounts/templates_and_reminders.blade.php
index 60e86641e1a0..91b82c3598fc 100644
--- a/resources/views/accounts/templates_and_reminders.blade.php
+++ b/resources/views/accounts/templates_and_reminders.blade.php
@@ -216,6 +216,8 @@
                 enableReminder(i);
             }
 
+            $('.show-when-ready').show();
+
             refreshPreview();
         });