diff --git a/lib/gollum/frontend/public/gollum/livepreview/index.html b/lib/gollum/frontend/public/gollum/livepreview/index.html
index 415c7599..069d6b9c 100644
--- a/lib/gollum/frontend/public/gollum/livepreview/index.html
+++ b/lib/gollum/frontend/public/gollum/livepreview/index.html
@@ -209,7 +209,7 @@ var makePreviewHtml = function () {
   // highlight code blocks.
   var codeElements = preview.getElementsByTagName("pre");
   var codeElementsLength = codeElements.length;
-
+  var hlSpace = "  ";
   if (codeElementsLength > 0) {
     for (var idx = 0; idx < codeElementsLength; idx++) {
       var element = codeElements[idx];
@@ -225,17 +225,17 @@ var makePreviewHtml = function () {
         // txt[0] = "`"; txt[1] = "ruby"
         if ($.inArray(txt[1], languages) === -1) {
           element.innerHTML = codeHTML.substring(1).trim();
-          element.className = "nohighlight";
+          hljs.highlightBlock(element, hlSpace);
           continue;
         }
 
         element.className = txt[1] + " highlight";
         // length + 1 for the marker character.
         element.innerHTML = codeHTML.substring(txt[1].length+1).trim();
-        hljs.highlightBlock(element, "  ");
+        hljs.highlightBlock(element, hlSpace);
       } else {
         element.innerHTML = codeHTML.substring(1).trim();
-        element.className = "nohighlight";
+        hljs.highlightBlock(element, hlSpace);
       }
     }
   }