diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
index 8993574a8..601753c05 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
@@ -468,6 +468,7 @@ namespace Barotrauma
         public Item FocusedItem
         {
             get { return focusedItem; }
+            set { focusedItem = value; }
         }
 
         public Item PickingItem
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs
index aac7bf9df..d9abe0511 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs
@@ -162,6 +162,7 @@ namespace Barotrauma.Items.Components
                     if (contained == null) continue;
                     if (contained.TryInteract(character))
                     {
+                        character.FocusedItem = contained;
                         return false;
                     }
                 }
@@ -178,6 +179,7 @@ namespace Barotrauma.Items.Components
                     if (contained == null) continue;
                     if (contained.TryInteract(picker))
                     {
+                        picker.FocusedItem = contained;
                         return true;
                     }
                 }