diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 6ea32dfc059..06528788cd0 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -777,22 +777,23 @@ class Form
             {
 				if (! $num)
 				{
-					print $langs->trans("NoProductMatching").' ';	
+					print '<select class="flat" name="'.$htmlname.'">';
+					print '<option value="0">-- '.$langs->trans("NoProductMatching").' --</option>';
 				}
-//				else
-//				{
+				else
+				{
 					print '<select class="flat" name="'.$htmlname.'" onchange="publish_selvalue(this);">';
-		            print "<option value=\"0\" selected=\"true\">&nbsp;</option>";
-//				}
+		            print '<option value="0" selected="true">-- '.$langs->trans("MatchingProducts").' --</option>';
+				}
 			}
 			else
 			{
 				print '<select class="flat" name="'.$htmlname.'">';
-	            print "<option value=\"0\" selected=\"true\">&nbsp;</option>";
+	            print '<option value="0" selected="true">&nbsp;</option>';
             }
     
             $i = 0;
-            while ($i < $num)
+            while ($num && $i < $num)
             {
                 $objp = $this->db->fetch_object($result);
                 
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 811ac73e34f..7f1cfcb7d92 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -104,4 +104,5 @@ ProductDeleted=Product/Service "%s" deleted from database.
 ExportDataset_produit_1=Products and services
 DeleteProductLine=Delete product line
 ConfirmDeleteProductLine=Are you sure you want to delete this product line?
-NoProductMatching=No product/service match your criteria
\ No newline at end of file
+NoProductMatching=No product/service match your criteria
+MatchingProducts=Matching products/services
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 55b1a1d1263..941a25a1717 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -104,4 +104,5 @@ ProductDeleted=Le produit/service "%s" 
 ExportDataset_produit_1=Produits et services
 DeleteProductLine=Supprimer ligne produit
 ConfirmDeleteProductLine=Êtes-vous sûr de vouloir effacer cette ligne produit ?
-NoProductMatching=Aucun produit/service ne répond au critère
\ No newline at end of file
+NoProductMatching=Aucun produit/service ne répond au critère
+MatchingProducts=Produits/Services trouvés
\ No newline at end of file