diff --git a/static/js/annotation.js b/static/js/annotation.js
index 3587736..d0d26b1 100644
--- a/static/js/annotation.js
+++ b/static/js/annotation.js
@@ -21,7 +21,7 @@ oml.ui.annotation = function(data, $iframe) {
             fontSize: '14px',
             lineHeight: '21px',
             padding: '8px'
-        }).html(data.text).on({
+        }).html(Ox.encodeHTMLEntities(data.text).replace(/\n/g, '<br/>')).on({
             click: function(event) {
                 $iframe.postMessage('selectAnnotation', {
                     id: data.id