1 files changed, 7 insertions, 1 deletions
diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 4d8ead858..483fcc3cc 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -166,8 +166,14 @@ function keyHandler(e){
         // keep current indention for lists and code
         var match = search.match(/(\n  +([\*-] ?)?)/);
         if(match){
+            var match2 = search.match(/^\n  +[\*-]\s*$/);
+            // Cancel list if the last item is empty (i. e. two times enter)
+            if (match2 && field.value.substr(selection.start).match(/^($|\n)/)) {
+                field.value = field.value.substr(0, linestart) + "\n";
+            } else {
+                insertAtCarret(field.id,match[1]);
+            }
             var scroll = field.scrollHeight;
-            insertAtCarret(field.id,match[1]);
             field.scrollTop += (field.scrollHeight - scroll);
             e.preventDefault(); // prevent enter key
             return false;