diff --git a/src/dashboardgeneral.html b/src/dashboardgeneral.html
index 03bfa9af8d..6c0f43eb34 100644
--- a/src/dashboardgeneral.html
+++ b/src/dashboardgeneral.html
@@ -62,7 +62,7 @@
                         <input is="emby-input" type="text" id="txtLoginDisclaimer" label="${LabelLoginDisclaimer}" />
                         <div class="fieldDescription">${LabelLoginDisclaimerHelp}</div>
                     </div>
-                    <div class="inputContainer">
+                    <div class="inputContainer customCssContainer">
                         <textarea is="emby-textarea" id="txtCustomCss" label="${LabelCustomCss}" class="textarea-mono"></textarea>
                         <div class="fieldDescription">${LabelCustomCssHelp}</div>
                     </div>
diff --git a/src/elements/emby-textarea/emby-textarea.js b/src/elements/emby-textarea/emby-textarea.js
index e0ce77aa51..e68b1dd149 100644
--- a/src/elements/emby-textarea/emby-textarea.js
+++ b/src/elements/emby-textarea/emby-textarea.js
@@ -55,6 +55,7 @@ define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'e
                 newHeight = textarea.scrollHeight/* - offset*/;
                 hasGrown = true;
             }
+            $('.customCssContainer').css("height", newHeight + 'px');
             textarea.style.height = newHeight + 'px';
         }