diff --git a/NewHorizons/Builder/Props/DialogueBuilder.cs b/NewHorizons/Builder/Props/DialogueBuilder.cs
index a0af7849..760e7091 100644
--- a/NewHorizons/Builder/Props/DialogueBuilder.cs
+++ b/NewHorizons/Builder/Props/DialogueBuilder.cs
@@ -216,6 +216,20 @@ namespace NewHorizons.Builder.Props
                 // TODO: make a custom controller for basic characters to just turn them to face you
             }
 
+            var facePlayerWhenTalking = character.GetComponent<FacePlayerWhenTalking>();
+            if (facePlayerWhenTalking != null)
+            {
+                if (facePlayerWhenTalking._dialogueTree != null)
+                {
+                    facePlayerWhenTalking._dialogueTree.OnStartConversation -= facePlayerWhenTalking.OnStartConversation;
+                    facePlayerWhenTalking._dialogueTree.OnEndConversation -= facePlayerWhenTalking.OnEndConversation;
+                }
+
+                facePlayerWhenTalking._dialogueTree = dialogue;
+                facePlayerWhenTalking._dialogueTree.OnStartConversation += facePlayerWhenTalking.OnStartConversation;
+                facePlayerWhenTalking._dialogueTree.OnEndConversation += facePlayerWhenTalking.OnEndConversation;
+            }
+
             if (info.lookAtRadius > 0)
             {
                 var playerTrackingZone = new GameObject("PlayerTrackingZone");
diff --git a/NewHorizons/External/Modules/PropModule.cs b/NewHorizons/External/Modules/PropModule.cs
index 3df98520..e939b267 100644
--- a/NewHorizons/External/Modules/PropModule.cs
+++ b/NewHorizons/External/Modules/PropModule.cs
@@ -421,7 +421,7 @@ namespace NewHorizons.External.Modules
 
             /// <summary>
             /// If this dialogue is meant for a character, this is the relative path from the planet to that character's
-            /// CharacterAnimController, TravelerController, TravelerEyeController (eye of the universe), or SolanumAnimController.
+            /// CharacterAnimController, TravelerController, TravelerEyeController (eye of the universe), FacePlayerWhenTalking, or SolanumAnimController.
             /// </summary>
             public string pathToAnimController;