diff --git a/panels/table/module.html b/panels/table/module.html
index ab70c773527eb..9fb7ef75d359c 100644
--- a/panels/table/module.html
+++ b/panels/table/module.html
@@ -52,7 +52,7 @@
                   <i class='icon-search pointer' ng-click="build_search(key,value)"></i> 
                   <i class='icon-ban-circle pointer' ng-click="build_search(key,value,true)"></i>
                 </td>
-                <td>{{value}}</td>
+                <td ng-bind-html-unsafe="value | endofline"></td>
               </tr> 
             </table>
           </td>
@@ -73,4 +73,4 @@
       </div>
     </div>
   </div>
-</kibana-panel>
\ No newline at end of file
+</kibana-panel>
diff --git a/panels/table/module.js b/panels/table/module.js
index a9d6989edf9fd..66cf07c0c756a 100644
--- a/panels/table/module.js
+++ b/panels/table/module.js
@@ -281,4 +281,16 @@ angular.module('kibana.table', [])
     }
     return '';
   }
+})
+.filter('endofline', function(){
+  return function(text){
+    if (!_.isUndefined(text) && !_.isNull(text) && text.toString().length > 0) {
+      return text.toString().
+        replace(/&/g, '&amp;').
+        replace(/</g, '&lt;').
+        replace(/>/g, '&gt;').
+        replace(/\r?\n/g, '<br/>')
+    }
+    return '';
+  }
 });