diff --git a/static/js/tasks.js b/static/js/tasks.js
index ae9f958..2dbb184 100644
--- a/static/js/tasks.js
+++ b/static/js/tasks.js
@@ -350,6 +350,9 @@ document.addEventListener("DOMContentLoaded", () => {
     document.getElementById("task-modal-close").addEventListener("click", closeTaskModal);
     document.getElementById("task-modal-cancel").addEventListener("click", closeTaskModal);
     document.getElementById("task-form").addEventListener("submit", handleTaskSubmit);
+    document.getElementById("task-save-btn").addEventListener("click", (e) => {
+        document.getElementById("task-form").dispatchEvent(new Event("submit", { cancelable: true }));
+    });
 
     document.getElementById("side-panel-close").addEventListener("click", closeSidePanel);
     document.getElementById("save-task-btn").addEventListener("click", saveTask);
diff --git a/templates/tasks.html b/templates/tasks.html
index 0a2a0a3..00b11ad 100644
--- a/templates/tasks.html
+++ b/templates/tasks.html
@@ -63,7 +63,7 @@
             <h2 id="task-modal-title">Create Task</h2>
             <button class="modal-close" id="task-modal-close">&times;</button>
         </div>
-        <form id="task-form" autocomplete="off">
+        <form id="task-form" autocomplete="off" novalidate>
             <input type="hidden" id="task-id">
             <div class="form-group">
                 <label for="task-title">Task Title</label>
@@ -75,7 +75,7 @@
             </div>
             <div id="task-error" class="error-message"></div>
             <div class="modal-actions">
-                <button type="submit" class="btn-primary">Save</button>
+                <button type="submit" class="btn-primary" id="task-save-btn">Save</button>
                 <button type="button" class="btn-secondary" id="task-modal-cancel">Cancel</button>
             </div>
         </form>