diff --git a/resources/views/invoices/email.blade.php b/resources/views/invoices/email.blade.php
index 7e06b43f6419..f8c366a4fb17 100644
--- a/resources/views/invoices/email.blade.php
+++ b/resources/views/invoices/email.blade.php
@@ -227,12 +227,17 @@
 </script>
 
 <style type="text/css">
-    #emailModal .tab-pane {
-        margin-top:20px;
-        max-height:320px;
+    #emailModal #preview.tab-pane,
+    #emailModal #history.tab-pane {
+        margin-top: 20px;
+        max-height: 320px;
         overflow-y:auto;
     }
 
+    #templateEditor {
+        max-height: 300px;
+    }
+
     @media only screen and (min-width : 767px) {
         .modal-dialog {
             width: 690px;