diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css
index 962280aee37c51f18337aa505a6964872546a945..c7290b78f5b32fd17950c09f0560489314b3e9b1 100644
--- a/war/src/main/webapp/css/style.css
+++ b/war/src/main/webapp/css/style.css
@@ -1006,4 +1006,10 @@ table.progress-bar.red td.progress-bar-done {
 
 /* ========================= textarea.jelly ================== */
 
-style="text-align:left; background-color: #EEE; padding: 0.5em; display: none;"
\ No newline at end of file
+.description-preview-container {
+    text-align:left;
+}
+.description-preview {
+    background-color: #F0F0F0;
+    padding: 0.5em;
+}
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 2540de40e549ba3423369fefe5e7e60ed6c6de16..ee2899d1832bf3cbc654c5b035f796fa2c1fc557 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1200,11 +1200,18 @@ var hudsonRules = {
         var previewDiv = findElementsBySelector(e,".description-preview")[0];
         var showPreview = findElementsBySelector(e,".description-show-preview")[0];
         var hidePreview = findElementsBySelector(e,".description-hide-preview")[0];
+        $(hidePreview).hide();
+        $(previewDiv).hide();
 
         showPreview.onclick = function() {
             // Several TEXTAREAs may exist if CodeMirror is enabled. The first one has reference to the CodeMirror object.
-            var textarea = showPreview.parentNode.getElementsByTagName("TEXTAREA")[0];
+            var textarea = e.parentNode.getElementsByTagName("TEXTAREA")[0];
             var text = textarea.codemirrorObject ? textarea.codemirrorObject.getValue() : textarea.value;
+            var render = function(txt) {
+                $(hidePreview).show();
+                $(previewDiv).show();
+                previewDiv.innerHTML = txt;
+            };
 
             new Ajax.Request(rootURL + "/markupFormatter/previewDescription", {
                 method: "POST",
@@ -1213,12 +1220,7 @@ var hudsonRules = {
                     description: text
                 },
                 onSuccess: function(obj) {
-                    this.render(obj.responseText)
-                },
-                render : function(txt) {
-                    $(previewDiv).show();
-                    $(previewDiv).show();
-                    previewDiv.innerHTML = txt;
+                    render(obj.responseText)
                 },
                 onFailure: function(obj) {
                     render(obj.status + " " + obj.statusText + "<HR/>" + obj.responseText)
@@ -1227,8 +1229,7 @@ var hudsonRules = {
             return false;
         }
 
-        /* var */
-        hidePreview.onclick = function(sender) {
+        hidePreview.onclick = function() {
             $(hidePreview).hide();
             $(previewDiv).hide();
         };