diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index b1a3a96bc3b..9061fd150b7 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -486,7 +486,7 @@ $tabcond[16] = (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_
 $tabcond[17] = (!empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled));
 $tabcond[18] = !empty($conf->expedition->enabled) || !empty($conf->reception->enabled);
 $tabcond[19] = !empty($conf->societe->enabled);
-$tabcond[20] = (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled));
+$tabcond[20] = (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled);
 $tabcond[21] = !empty($conf->propal->enabled);
 $tabcond[22] = (!empty($conf->commande->enabled) || !empty($conf->propal->enabled));
 $tabcond[23] = true;
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index a4c54275041..90d935705aa 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2286,7 +2286,7 @@ function top_menu_quickadd()
                 ';
 	}
 
-	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->creer) {
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->commande->creer) || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->creer)) {
 		$langs->load("orders");
 		$dropDownQuickAddHtml .= '
                 <!-- Supplier order link -->
@@ -2299,7 +2299,7 @@ function top_menu_quickadd()
                 ';
 	}
 
-	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->creer) {
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->creer) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->creer)) {
 		$langs->load("bills");
 		$dropDownQuickAddHtml .= '
                 <!-- Supplier invoice link -->