diff --git a/static/js/infoView.js b/static/js/infoView.js
index 5129afe..30cf042 100644
--- a/static/js/infoView.js
+++ b/static/js/infoView.js
@@ -640,7 +640,10 @@ oml.ui.infoView = function(identifyData) {
                                     })
                                     .bindEvent({
                                         submit: function(event) {
-                                            editMetadata('description', event.value);
+                                            editMetadata(
+                                                'description',
+                                                event.value.replace(/<br>/g, '\n')
+                                            );
                                         }
                                     })
                             ).appendTo($info);
@@ -728,7 +731,7 @@ oml.ui.infoView = function(identifyData) {
                     if (Ox.contains(arrayKeys, key)) {
                         edit[key] = value ? splitValue(value) : [];
                     } else {
-                        edit[key] = value;
+                        edit[key] = Ox.decodeHTMLEntities(value);
                     }
                     oml.api.edit(edit, function(result) {
                         Ox.Request.clearCache();