diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ea47e0877ee..5f2767b3e20 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1114,6 +1114,9 @@ label.error {
     font-weight: bold;
     font-size: 13px;
 }
+.openerp .oe_tooltip_help {
+    white-space: pre-wrap;
+}
 .openerp .oe_tooltip_technical {
     padding: 0 0 4px 0;
     margin: 5px 0 0 15px;
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index dce45f1a0a2..843d6b65a7d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -790,7 +790,7 @@ openerp.web.form.Widget = openerp.web.Widget.extend(/** @lends openerp.web.form.
         trigger = trigger || this.$element;
         options = _.extend({
                 delay: 1000,
-                maxWidth: openerp.connection.debug ? '300px' : '200px',
+                maxWidth: '500px',
                 content: function() {
                     var template = widget.template + '.tooltip';
                     if (!QWeb.has_template(template)) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index ef7437c888b..7fcee86537e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -837,9 +837,7 @@
     <div class="oe_tooltip_string" t-if="widget.string">
         <t t-esc="widget.string"/> <t t-if="debug and widget.nolabel">(nolabel)</t>
     </div>
-    <p t-if="widget.help" class="oe_tooltip_help">
-        <t t-esc="widget.help"/>
-    </p>
+    <p t-if="widget.help" class="oe_tooltip_help"><t t-esc="widget.help"/></p>
     <ul t-if="debug" class="oe_tooltip_technical">
         <li data-item="field" t-if="widget.name">
             <span class="oe_tooltip_technical_title">Field:</span>