diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5d942879128..841d83351f2 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1383,7 +1383,6 @@
   padding: 0;
 }
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
-  white-space: nowrap;
   padding-right: 8px;
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
@@ -1640,6 +1639,9 @@
 .openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell {
   padding: 2px 2px 2px 8px !important;
 }
+.openerp .oe_form .oe_form_group_label_nowrap > tbody > tr.oe_form_group_row > td.oe_form_group_cell > label {
+  white-space: nowrap;
+}
 .openerp .oe_listview_nocontent > img {
   float: left;
   margin-right: 1.5em;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3860b8076e6..8eccbb247c0 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1141,7 +1141,6 @@ $colour4: #8a89ba
     // FormView.label {{{
     .oe_form
         .oe_form_label_help[for], .oe_form_label[for]
-            white-space: nowrap
             padding-right: 8px
             span
                 font-size: 80%
@@ -1382,6 +1381,8 @@ $colour4: #8a89ba
         .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell,
         .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell
             padding: 2px 2px 2px 8px !important
+        .oe_form_group_label_nowrap > tbody > tr.oe_form_group_row > td.oe_form_group_cell > label
+            white-space: nowrap
 
     // }}}
     // ListView {{{