diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 02de9b4d47d..fc966f7f19a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4033,7 +4033,7 @@ class Product extends CommonObject
             }
 
             $linkclose.= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
-            $linkclose.= ' class="classfortooltip"';
+            $linkclose.= ' class="nowraponall classfortooltip"';
 
             /*
             $hookmanager->initHooks(array('productdao'));
@@ -4042,6 +4042,10 @@ class Product extends CommonObject
             if ($reshook > 0) $linkclose = $hookmanager->resPrint;
             */
         }
+        else
+        {
+        	$linkclose = ' class="nowraponall"';
+        }
 
         if ($option == 'supplier' || $option == 'category') {
             $url = DOL_URL_ROOT.'/product/fournisseurs.php?id='.$this->id;
@@ -4062,7 +4066,7 @@ class Product extends CommonObject
             }
         }
 
-        $linkstart = '<a class="nowraponall" href="'.$url.'"';
+        $linkstart = '<a href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';