diff --git a/Masa.Blazor.ProApp/Masa.Blazor.ProApp.Rcl/Models/Task.cs b/Masa.Blazor.ProApp/Masa.Blazor.ProApp.Rcl/Models/Task.cs
index d89f013..e494639 100644
--- a/Masa.Blazor.ProApp/Masa.Blazor.ProApp.Rcl/Models/Task.cs
+++ b/Masa.Blazor.ProApp/Masa.Blazor.ProApp.Rcl/Models/Task.cs
@@ -1,16 +1,16 @@
-namespace Masa.Blazor.ProApp.Rcl.Models;
+using System.ComponentModel.DataAnnotations;
+
+namespace Masa.Blazor.ProApp.Rcl.Models;
 
 public class TodoTask
 {
     public int Id { get; set; }
 
-    public string? Title { get; set; }
-
-    public string? Assignee { get; set; }
+    [Required] public string? Title { get; set; }
 
     public string? Description { get; set; }
 
-    public DateOnly DueAt { get; set; }
+    [Required] public DateOnly DueAt { get; set; }
 
     public bool Important { get; set; }
 
diff --git a/Masa.Blazor.ProApp/Masa.Blazor.ProApp.Rcl/Pages/Todo.razor b/Masa.Blazor.ProApp/Masa.Blazor.ProApp.Rcl/Pages/Todo.razor
index 6975319..d730131 100644
--- a/Masa.Blazor.ProApp/Masa.Blazor.ProApp.Rcl/Pages/Todo.razor
+++ b/Masa.Blazor.ProApp/Masa.Blazor.ProApp.Rcl/Pages/Todo.razor
@@ -17,7 +17,8 @@
     </MButton>
 </div>
 
-<MBottomSheet ContentClass="px-4 py-2">
+<MBottomSheet @bind-Value="_newTaskSheet"
+              ContentClass="px-4 py-2">
     <ActivatorContent>
         <MButton Fixed Right Fab Color="primary"
                  Style="bottom: 72px;"
@@ -26,38 +27,42 @@
         </MButton>
     </ActivatorContent>
     <ChildContent>
-        <MTextField @bind-Value="@_todoTask.Title"
-                    Class="my-2"
-                    Dense
-                    Filled
-                    Rounded
-                    HideDetails="true"
-                    Placeholder="Title"
-                    PersistentPlaceholder>
-        </MTextField>
-
-        <MTextarea @bind-Value="@_todoTask.Description"
-                   Dense
-                   Filled
-                   Rounded
-                   HideDetails="true"
-                   Placeholder="Description"
-                   PersistentPlaceholder>
-        </MTextarea>
-
-        <div Class="d-flex align-center my-2">
-            <MButton Color="secondary" Text>
-                <MIcon Left>mdi-calendar-today-outline</MIcon>
-                Today
-            </MButton>
-            <MButton Icon>
-                <MIcon>mdi-flag-variant-outline</MIcon>
-            </MButton>
-            <MSpacer/>
-            <MButton Icon Color="primary">
-                <MIcon>mdi-arrow-up-circle</MIcon>
-            </MButton>
-        </div>
+        <MForm Model="_todoTask"
+               EnableValidation
+               OnInvalidSubmit="HandleOnSubmit">
+            <MTextField @bind-Value="@_todoTask.Title"
+                        Class="my-2"
+                        Dense
+                        Filled
+                        Rounded
+                        HideDetails="true"
+                        Placeholder="Title"
+                        PersistentPlaceholder>
+            </MTextField>
+
+            <MTextarea @bind-Value="@_todoTask.Description"
+                       Dense
+                       Filled
+                       Rounded
+                       HideDetails="true"
+                       Placeholder="Description"
+                       PersistentPlaceholder>
+            </MTextarea>
+
+            <div Class="d-flex align-center my-2">
+                <MButton Color="secondary" Text>
+                    <MIcon Left>mdi-calendar-today-outline</MIcon>
+                    Today
+                </MButton>
+                <MButton Icon>
+                    <MIcon>mdi-flag-variant-outline</MIcon>
+                </MButton>
+                <MSpacer/>
+                <MButton Icon Color="primary" Type="submit">
+                    <MIcon>mdi-arrow-up-circle</MIcon>
+                </MButton>
+            </div>
+        </MForm>
     </ChildContent>
 </MBottomSheet>
 
@@ -67,6 +72,7 @@
 @code {
 
     private bool? _drawer = false;
+    private bool _newTaskSheet;
 
     private string Category => Filter ?? "inbox";
 
@@ -74,5 +80,12 @@
 
     [Parameter] public string? Filter { get; set; }
 
+    private async Task HandleOnSubmit()
+    {
+        // TODO: Save the task
+
+        _newTaskSheet = false;
+    }
+
 
 }
\ No newline at end of file