diff --git a/Pages/Desserts.razor b/Pages/Desserts.razor
index 66a57cb..789c5f0 100644
--- a/Pages/Desserts.razor
+++ b/Pages/Desserts.razor
@@ -32,7 +32,7 @@
 @if (CartService.DessertModalShowed)
 {
     <DessertModal Order="CartService.Order" OnCancel="CartService.HideDessertModal"
-                  OnConfirm="ConfirmOrder"/>
+                  OnConfirm="() => CartService.ConfirmOrder(MessageService)"/>
 }
 
 @code {
@@ -43,11 +43,4 @@
         _desserts = await HttpClient.GetFromJsonAsync<List<Dessert>>(NavigationManager.BaseUri + "api/desserts");
     }
 
-    private void ConfirmOrder()
-    {
-        CartService.Cart.Orders!.Add(CartService.Order!);
-        CartService.Order = null;
-        MessageService.SendMessage();
-        CartService.DessertModalShowed = false;
-    }
 }
\ No newline at end of file
diff --git a/Services/CartService.cs b/Services/CartService.cs
index 61ad983..964485f 100644
--- a/Services/CartService.cs
+++ b/Services/CartService.cs
@@ -4,8 +4,8 @@ namespace kuro_desserts.Services;
 
 public class CartService
 {
-    public bool DessertModalShowed { get; set; }
-    public Order? Order { get; set; }
+    public bool DessertModalShowed { get; private set; }
+    public Order? Order { get; private set; }
 
     public Cart Cart { get; } = new()
     {
@@ -31,6 +31,14 @@ public void HideDessertModal()
         Order = null;
         DessertModalShowed = false;
     }
+    
+    public void ConfirmOrder(MessageService messageService)
+    {
+        Cart.Orders!.Add(Order!);
+        Order = null;
+        messageService.SendMessage();
+        DessertModalShowed = false;
+    }
 
     public void RemoveOrder(Order order)
     {
diff --git a/Shared/Modals/DessertModal.razor b/Shared/Modals/DessertModal.razor
index 206f1c4..76c976a 100644
--- a/Shared/Modals/DessertModal.razor
+++ b/Shared/Modals/DessertModal.razor
@@ -17,8 +17,8 @@
                     <label class="form-label">Size:</label>
                     <span class="badge text-bg-info">@Order.Size oz</span>
                     <input type="range" class="form-range" min="9" max="24" @bind="Order.Size" @bind:event="oninput">
-                    <p class="text-danger text-start mb-0 mx-3">*required</p>
-                    <select class="form-select mb-3" @bind-Value="@Order.FlavorId" @onchange="EnableButton">
+                    <p class="text-danger text-start mb-0 mx-3 mt-3">*required</p>
+                    <select class="form-select mb-3" @onchange="EnableButton">
                         <option value="" selected>Select your flavor</option>
                         @if (_flavors != null)
                         {
@@ -88,7 +88,15 @@
 
     private void EnableButton(ChangeEventArgs e)
     {
-        _flavorSelected = e.Value!.ToString() != "";
+        if (e.Value!.ToString() == "")
+        {
+            _flavorSelected = false;
+        }
+        else
+        {
+            _flavorSelected = true;
+            Order.FlavorId = Guid.Parse(e.Value.ToString()!);
+        }
     }
 
 }
\ No newline at end of file