diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 6308c33d268..983a44f4685 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1620,7 +1620,6 @@ if (!$error && $action == 'confirm_edit_value_extrafields' && $confirm == 'yes'
 		if ($result>0) {
 			// Fill array 'array_options' with data from add form
 			$ret = $e->setOptionalsFromPost(null, $objecttmp, $extrafieldKeyToUpdate);
-
 			if ($ret > 0) {
 				$objecttmp->insertExtraFields(); // TODO gérer l'erreur
 			} else {
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 8e364cd24e1..3e7631d76bf 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -213,10 +213,10 @@ if ($massaction == 'presend') {
 
 if ($massaction == 'edit_extrafields') {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-	$elementtype = 'product';
+	$elementtype = $objecttmp->element;
 	/** @var CommonObject $objecttmp */
 	$extrafields = new ExtraFields($db);
-
+	$keysuffix = '';
 	$extrafields->fetch_name_optionals_label($elementtype);
 	$extrafields_list = $extrafields->attributes[$elementtype]['label'];
 
@@ -226,12 +226,40 @@ if ($massaction == 'edit_extrafields') {
 
 		$formquestion[] = array(
 			'type' => 'other',
-			'value' => $form->selectarray('extrafield-key-to-update', $extrafields_list, GETPOST('extrafield-key-to-update'))
+			'value' => $form->selectarray('extrafield-key-to-update', $extrafields_list, GETPOST('extrafield-key-to-update'), 1)
 		);
 
+
+		$outputShowOutputFields = '<div class="extrafields-inputs">';
+		//
+		//      foreach ($extrafields_list as $extraKey => $extraLabel){
+		//          $outputShowOutputFields.= '<div class="mass-action-extrafield_'.$key.'">';
+		//
+		//          $outputShowOutputFields.= 'rrrrrrrr'.$extrafields->showInputField($key, '', '', $keysuffix, '', 0, $objecttmp->id, $objecttmp->table_element).'dddddddddd';
+		//          $outputShowOutputFields.= 'rrrrrrrr'.$extrafields->showInputField($key, '', '', $keysuffix, '', '', $objecttmp->id, $objecttmp->table_element).'dddddddddd';
+		//
+		//          $outputShowOutputFields.= '</div>';
+		//      }
+		$outputShowOutputFields.= '<table>'.$object->showOptionals($extrafields, 'create').'</table>';
+		$outputShowOutputFields.= '<script>
+		jQuery(function($) {
+			$(".extrafields-inputs .valuefieldcreate").hide();
+            $("#extrafield-key-to-update").on(\'change\',function(){
+            	let selectedExtrtafield = $(this).val();
+            	if($(".extrafields-inputs .product_extras_"+selectedExtrtafield) != undefined){
+					$(".extrafields-inputs .valuefieldcreate").hide();
+					$(".extrafields-inputs .product_extras_"+selectedExtrtafield).show();
+                }
+            });
+		});
+		</script>';
+		$outputShowOutputFields.= '</div>';
+
+
+
 		$formquestion[] = array(
 			'type' => 'other',
-			'value' => $object->showOptionals($extrafields, 'create')
+			'value' => $outputShowOutputFields
 			);
 
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmEditExtrafield"), $langs->trans("ConfirmEditExtrafieldQuestion", count($toselect)), "confirm_edit_value_extrafields", $formquestion, 1, 0, 200, 500, 1);