diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskDetail.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskDetail.java
index be14e0c3b..9afa6f5d3 100644
--- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskDetail.java
+++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskDetail.java
@@ -149,9 +149,20 @@ public class TaskDetail extends HtmlMacroComponent implements AfterCompose {
         TaskDetail belowDetail = getBelowDetail();
         if (belowDetail != null) {
             belowDetail.receiveFocus(position);
+        } else {
+            ListDetails listDetails = getListDetails();
+            listDetails.addTask();
         }
     }
 
+    private ListDetails getListDetails() {
+        Component current = getParent();
+        while (!(current instanceof ListDetails)) {
+            current = current.getParent();
+        }
+        return (ListDetails) current;
+    }
+
     public void userWantsToMove(Textbox textbox, KeyEvent keyEvent) {
         Navigation navigation = Navigation.getIntentFrom(keyEvent);
         List<Textbox> textBoxSiblingsIncludedItself = getTextBoxSiblingsIncludedItself(textbox);