diff --git a/src/app/components/add-task/add-task.component.html b/src/app/components/add-task/add-task.component.html
index 755fa79..76023ef 100644
--- a/src/app/components/add-task/add-task.component.html
+++ b/src/app/components/add-task/add-task.component.html
@@ -10,6 +10,7 @@
 
   <form
     (ngSubmit)="onSubmit(taskForm, overlayData)"
+    (keydown.enter)="handleEnterKey($event)"
     #taskForm="ngForm"
     onsubmit="return false"
   >
diff --git a/src/app/components/add-task/add-task.component.ts b/src/app/components/add-task/add-task.component.ts
index 80df90e..cd512fd 100644
--- a/src/app/components/add-task/add-task.component.ts
+++ b/src/app/components/add-task/add-task.component.ts
@@ -192,6 +192,20 @@ export class AddTaskComponent {
     this.taskData.subtasksDone = [];
   }
 
+  handleEnterKey(event: Event) {
+    event.preventDefault();
+    if (event instanceof KeyboardEvent) {
+      if (event.target instanceof HTMLInputElement) {
+        const inputField = event.target as HTMLInputElement;
+        if (inputField.name === 'subtask') {
+          this.addSubtask(inputField.value);
+          inputField.value = '';
+          this.subtaskValue = '';
+        }
+      }
+    }
+  }
+
   onSubmit(ngForm: NgForm, overlayData: string) {
     if (ngForm.submitted && ngForm.form.valid) {
       if (overlayData === '') {