diff --git a/Patches/ContextMenuShortcutPatches.cs b/Patches/ContextMenuShortcutPatches.cs
index cbd19e5..861cac4 100644
--- a/Patches/ContextMenuShortcutPatches.cs
+++ b/Patches/ContextMenuShortcutPatches.cs
@@ -29,7 +29,7 @@ namespace UIFixes
             {
                 // Need an item context to operate on, and ignore these keypresses if there's a focused textbox somewhere
                 ItemContextAbstractClass itemContext = __instance.R().ItemContext;
-                if (itemContext == null || EventSystem.current?.currentSelectedGameObject?.GetComponent<TMP_InputField>() != null)
+                if (itemContext == null || EventSystem.current?.currentSelectedGameObject != null && EventSystem.current.currentSelectedGameObject.GetComponent<TMP_InputField>() != null)
                 {
                     return;
                 }
diff --git a/Patches/SwapPatches.cs b/Patches/SwapPatches.cs
index 96aa0c2..80667db 100644
--- a/Patches/SwapPatches.cs
+++ b/Patches/SwapPatches.cs
@@ -1,5 +1,6 @@
 using Aki.Reflection.Patching;
 using Aki.Reflection.Utils;
+using EFT;
 using EFT.InventoryLogic;
 using EFT.UI;
 using EFT.UI.DragAndDrop;
@@ -381,6 +382,17 @@ namespace UIFixes
                     return;
                 }
 
+                // Swapping items with each other when both are on an equipped gun in raid doesn't work
+                if (itemController is Player.PlayerInventoryController playerInventoryController)
+                {
+                    Item item1 = __instance.Item.GetRootItem();
+                    Item item2 = targetItemContext.Item.GetRootItem();
+                    if (item1 == item2 && playerInventoryController.IsItemEquipped(item1))
+                    {
+                        return;
+                    }
+                }
+
                 if (!ValidPrerequisites(__instance, targetItemContext, operation))
                 {
                     return;