diff --git a/src/client/js/app-edit.js b/src/client/js/app-edit.js
index e64d09b..103ac9b 100644
--- a/src/client/js/app-edit.js
+++ b/src/client/js/app-edit.js
@@ -1,4 +1,4 @@
-(function(CodeMirror) {
+(function(window, document, console, CodeMirror) {
 
   var editor,
       updatePreviewDelay = 1000,
@@ -35,6 +35,7 @@
             console.error('Rendering markdown failed', error);
           } else {
             document.getElementById('content').innerHTML = result;
+            slimwiki.View.updateSyntaxHighlighting();
             console.log('Updated preview in ' + (new Date().getTime() - start) + ' ms');
           }
 
@@ -76,4 +77,4 @@
 
   init();
 
-})(CodeMirror);
+})(window, document, console, CodeMirror);
diff --git a/src/client/js/app-view.js b/src/client/js/app-view.js
index 0cc359d..4d71352 100644
--- a/src/client/js/app-view.js
+++ b/src/client/js/app-view.js
@@ -1 +1,17 @@
-hljs.initHighlightingOnLoad();
+(function(window, document, hljs) {
+
+  window.slimwiki = window.slimwiki || {};
+
+  window.slimwiki.View = {
+    updateSyntaxHighlighting: updateSyntaxHighlighting
+  };
+
+  updateSyntaxHighlighting();
+
+
+  function updateSyntaxHighlighting() {
+    var blocks = document.getElementById('content').querySelectorAll('pre code');
+    Array.prototype.forEach.call(blocks, hljs.highlightBlock);
+  }
+
+})(window, document, hljs);