diff --git a/WebApp/Components/Shared/Components/InteractiveChip.razor b/WebApp/Components/Shared/Components/InteractiveChip.razor
index 05162b6..703e5bc 100644
--- a/WebApp/Components/Shared/Components/InteractiveChip.razor
+++ b/WebApp/Components/Shared/Components/InteractiveChip.razor
@@ -6,9 +6,8 @@
           Class="@WrapperClass"
           @onmouseenter="@(() => _isHovered = true)"
           @onmouseleave="@(() => _isHovered = false)"
-          @ontouchstart="@(() => _isTouched = true)"
-          @ontouchend="@(() => { /* Prevent mouse events on touch */ })"
-          @onclick="@HandleClick">
+          @ontouchstart="@HandleTouchStart"
+          @ontouchend="@((e) => { e.PreventDefault(); })">
     <MudChip T="string" 
              Size="@Size" 
              Color="@Color" 
@@ -69,12 +68,10 @@
     private bool _isHovered = false;
     private bool _isTouched = false;
 
-    private void HandleClick(MouseEventArgs e)
+    private void HandleTouchStart(TouchEventArgs e)
     {
-        // On touch devices, toggle controls on tap (for devices with both touch and mouse)
-        if (_isTouched)
-        {
-            _isTouched = !_isTouched;
-        }
+        _isTouched = !_isTouched;
+        e.StopPropagation();
+        StateHasChanged();
     }
 }
\ No newline at end of file