diff --git a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs
index ea09498f..0603616e 100644
--- a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs
+++ b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs
@@ -543,7 +543,7 @@ namespace Unity.BossRoom.Gameplay.UserInput
             }
             if (Input.GetKeyDown(KeyCode.R)) // Freeze Throw
             {
-                 ActivateAbilityIfAllowed(GameDataSource.Instance.FreezeThrowAbilityKey);
+                ActivateAbilityIfAllowed(GameDataSource.Instance.FreezeThrowAbilityKey);
             }
             if (Input.GetKeyDown(KeyCode.F)) // Vector Wall
             {
@@ -643,12 +643,9 @@ namespace Unity.BossRoom.Gameplay.UserInput
             {
                 m_ServerCharacter.Movement.CancelMove();
             }
-            if (!EventSystem.current.IsPointerOverGameObject() && m_CurrentSkillInput == null)
+            if (IsSwapModeActive && Input.GetMouseButtonDown(0)) // Left-click to request swap
             {
-                if (IsSwapModeActive && Input.GetMouseButtonDown(0)) // Left-click to request swap
-                {
-                    HandleSwapRequest();
-                }
+                HandleSwapRequest();
             }
         }