diff --git a/module/environnement.js b/module/environnement.js
index b26c9747..90ca00ba 100644
--- a/module/environnement.js
+++ b/module/environnement.js
@@ -150,21 +150,31 @@ export class EnvironmentSheetHelper {
 
   static activateListeners(sheet, html) {
     if (!sheet.options.editable) return;
+    html.find("input.input-selection-milieu").keypress(event => {
+      if (event.keyCode == '13') {
+        EnvironmentSheetHelper.onAddMilieu(html, sheet, event);
+      }
+      event.stopPropagation();
+    })
     html.find("a.milieu-add").click(event => EnvironmentSheetHelper.onAddMilieu(html, sheet, event));
     html.find("div.environnement-milieu a.milieu-delete").click(event => EnvironmentSheetHelper.onDeleteMilieu(sheet, event));
     html.find("div.environnement-milieu select.environnement-rarete").change(event => EnvironmentSheetHelper.onChange(sheet, event,
-      (updated) => {
-        const name = $(event.currentTarget).val();
-        const rarete = Environnement.getRarete(name);
-        updated.rarete = rarete.name;
-        updated.frequence = Math.min(
-          Math.max(rarete.min, updated.frequence ?? rarete.frequence),
-          rarete.max);
-      }));
+      updated => EnvironmentSheetHelper.$changeRarete(event, updated)));
     html.find("div.environnement-milieu input[name='environnement-frequence']").change(event => EnvironmentSheetHelper.onChange(sheet, event,
-      (updated) => {
-        updated.frequence = Number($(event.currentTarget).val())
-      }));
+      updated => EnvironmentSheetHelper.$changeFrequence(updated, event)));
+  }
+
+  static $changeFrequence(updated, event) {
+    updated.frequence = Number($(event.currentTarget).val());
+  }
+
+  static $changeRarete(event, updated) {
+    const name = $(event.currentTarget).val();
+    const rarete = Environnement.getRarete(name);
+    updated.rarete = rarete.name;
+    updated.frequence = Math.min(
+      Math.max(rarete.min, updated.frequence ?? rarete.frequence),
+      rarete.max);
   }
 
   static async onAddMilieu(html, sheet, event) {
@@ -186,7 +196,7 @@ export class EnvironmentSheetHelper {
 
   static async onDeleteMilieu(sheet, event) {
     const milieu = EnvironmentSheetHelper.$getEventMilieu(event);
-    if (milieu) {
+    if (milieu != undefined) {
       const newList = sheet.item.system.environnement.filter(it => it.milieu != milieu)
         .sort(Misc.ascending(it => it.milieu));
       await sheet.item.update({ 'system.environnement': newList });
diff --git a/templates/scripts/autocomplete-script.hbs b/templates/scripts/autocomplete-script.hbs
index 7f918b6c..281565f9 100644
--- a/templates/scripts/autocomplete-script.hbs
+++ b/templates/scripts/autocomplete-script.hbs
@@ -81,7 +81,6 @@ function autocomplete(input, proposals) {
         currentFocus--;
         addActive(container);
       } else if (e.keyCode == 13) {
-        e.preventDefault();
         if (currentFocus > -1 && container) {
           container[currentFocus].click();
         }