diff --git a/codeGrader/frontend/admin/handlers/Task.py b/codeGrader/frontend/admin/handlers/Task.py
index 3069621..6457041 100644
--- a/codeGrader/frontend/admin/handlers/Task.py
+++ b/codeGrader/frontend/admin/handlers/Task.py
@@ -121,6 +121,7 @@ def post(self, id_: int) -> Response:
             task_data["tag"] = self.get_value("tag")
             task_data["description"] = self.get_value("description")
             task_data["exercise_id"] = self.get_value("exercise")
+            task_data["timeout"] = self.get_value("timeout")
 
             # getting the data from the form provided in the request
             self.api.put(f"/task/{id_}", body=task_data)
@@ -175,6 +176,7 @@ def post(self) -> Response:
             task_data["tag"] = self.get_value("tag")
             task_data["description"] = self.get_value("description")
             task_data["exercise_id"] = self.get_value("exercise")
+            task_data["timeout"] = self.get_value("timeout")
 
             self.api.post("/task/add", body=task_data)
 
diff --git a/codeGrader/frontend/admin/templates/addTask.html b/codeGrader/frontend/admin/templates/addTask.html
index 88aa334..0054d5c 100644
--- a/codeGrader/frontend/admin/templates/addTask.html
+++ b/codeGrader/frontend/admin/templates/addTask.html
@@ -48,6 +48,12 @@ <h1 class="header1">Task</h1>
                                     cols="100">{{ description }}</textarea>
                             </td>
                         </tr>
+                        <tr>
+                            <td class=" data">Tag</td>
+                            <td>
+                                <input class="input" type="text" id="input_timeout" name="timeout" placeholder="Timeout in seconds">
+                            </td>
+                        </tr>
                         <tr>
                             <td class=" data">Tag</td>
                             <td>
diff --git a/codeGrader/frontend/admin/templates/task.html b/codeGrader/frontend/admin/templates/task.html
index 1969513..0474c32 100644
--- a/codeGrader/frontend/admin/templates/task.html
+++ b/codeGrader/frontend/admin/templates/task.html
@@ -65,6 +65,13 @@ <h1 class="header1">Task {{ name }}</h1>
                                       name="description" rows="3" cols="100">{{ description }}</textarea>
                         </td>
                     </tr>
+                    <tr>
+                        <td>Timeout</td>
+                        <td>
+                            <input class="input" {% if not editable %} readonly {% endif %} type="text" id="input_timeout"
+                                   name="tag" value="{{ timeout }}">
+                        </td>
+                    </tr>
                     <tr>
                         <td>Tag</td>
                         <td>