diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 5bed07f7..5aa1f80b 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -2602,6 +2602,12 @@ function rcube_tasklist_ui(settings)
                 name = $('#taskedit-tasklistame').prop('disabled', list.norename||false).val(list.editname || list.name);
                 alarms = $('#taskedit-showalarms').prop('checked', list.showalarms).get(0);
                 name.select();
+
+                // suppress form submission with <Enter>
+                editform.on('submit', function(e) {
+                    e.preventDefault();
+                    return false;
+                });
             }
         });