diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
index 94a56cc0d5..3e592113b1 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
@@ -1245,7 +1245,7 @@ namespace EMotionFX
         }
         else
         {
-            SetMotionExtractionNodeIndex(MCORE_INVALIDINDEX32);
+            SetMotionExtractionNodeIndex(InvalidIndex);
         }
     }
 
diff --git a/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.cpp b/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.cpp
index 41253a513e..b1f8733bfe 100644
--- a/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.cpp
@@ -66,6 +66,7 @@ namespace EMStudio
         m_jointSelectionWindow = new NodeSelectionWindow(this, m_singleJointSelection);
         connect(m_jointSelectionWindow, &NodeSelectionWindow::rejected, this, &ActorJointBrowseEdit::OnSelectionRejected);
         connect(m_jointSelectionWindow->GetNodeHierarchyWidget()->GetTreeWidget(), &QTreeWidget::itemSelectionChanged, this, &ActorJointBrowseEdit::OnSelectionChanged);
+        connect(m_jointSelectionWindow->GetNodeHierarchyWidget(), &NodeHierarchyWidget::OnSelectionDone, this, &ActorJointBrowseEdit::OnSelectionDone);
 
         NodeSelectionWindow::connect(m_jointSelectionWindow, &QDialog::finished, [=]([[maybe_unused]] int resultCode)
             {