diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index ee008eb5e31..2f1ce77f0d8 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -321,7 +321,12 @@
         <t t-if="display_assignee"> (originally assigned to <span t-field="activity.user_id.name"/>)</t>
         <span t-if="activity.summary">: </span><span t-if="activity.summary" t-field="activity.summary"/>
     </p>
-    <div t-if="feedback" t-esc="feedback"/>
+    <div t-if="feedback">
+        <t t-foreach="feedback.split('\n')" t-as="feedback_line">
+            <t t-esc="feedback_line"/>
+            <br t-if="not feedback_line_last"/>
+        </t>
+    </div>
     <t t-if="activity.note != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'"><!-- <p></br></p> -->
         <div class="o_mail_note_title"><strong>Original note:</strong></div>
         <div t-field="activity.note"/>
diff --git a/addons/web/static/src/js/views/kanban/kanban_record.js b/addons/web/static/src/js/views/kanban/kanban_record.js
index b643b8355b6..4dff9d74fe3 100644
--- a/addons/web/static/src/js/views/kanban/kanban_record.js
+++ b/addons/web/static/src/js/views/kanban/kanban_record.js
@@ -695,9 +695,11 @@ var KanbanRecord = Widget.extend({
     _onKeyDownCard: function (event) {
         switch (event.keyCode) {
             case $.ui.keyCode.ENTER:
-                event.preventDefault();
-                this._onGlobalClick(event);
-                break;
+                if ($(event.target).hasClass('oe_kanban_global_click')) {
+                    event.preventDefault();
+                    this._onGlobalClick(event);
+                    break;
+                }
         }
     },
     /**