diff --git a/scenes/scene_farm_outside_2d.tscn b/scenes/scene_farm_outside_2d.tscn
index eefb06f..e8bc817 100644
--- a/scenes/scene_farm_outside_2d.tscn
+++ b/scenes/scene_farm_outside_2d.tscn
@@ -954,7 +954,7 @@ z_index = 1
 y_sort_enabled = true
 
 [node name="Yeli" parent="YSorted" instance=ExtResource("26_vnhck")]
-position = Vector2(6403, 3362)
+position = Vector2(6385, 3356)
 _timelinesToPlay = PackedStringArray("yeli_quest_select")
 
 [node name="Vesna" parent="YSorted" instance=ExtResource("27_6aw34")]
diff --git a/scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs b/scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs
index 10c116e..7c5e9c8 100644
--- a/scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs
+++ b/scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs
@@ -19,6 +19,7 @@ public partial class InteractionArea2D : Node2D
     [Export] private int _id = -1; // TODO: remove
 
     private Material[] _backupMaterials;
+    private bool _initializationComplete;
 
     [Signal] public delegate void InteractedToolEventHandler(int id); // TODO: remove
 
@@ -33,6 +34,8 @@ public partial class InteractionArea2D : Node2D
             Visible = value;
             _selectionChangeListener.ProcessMode = value ? ProcessModeEnum.Inherit : ProcessModeEnum.Disabled;
             _active = value;
+            if(!_active && _initializationComplete)
+                ResetHighlight();
         } 
     }
 
@@ -48,6 +51,7 @@ public partial class InteractionArea2D : Node2D
         if (_useOutline)
         {
             _backupMaterials = _spritesToOutline.Select(s => s.Material).ToArray();
+            _initializationComplete = true;
         }
     }