diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp index 744c53ef5a..3d764554ef 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp @@ -212,7 +212,17 @@ namespace AzToolsFramework::Prefab AZ::EntityId PrefabFocusHandler::GetFocusedPrefabContainerEntityId([[maybe_unused]] AzFramework::EntityContextId entityContextId) const { - return m_focusedInstanceContainerEntityId; + if (m_focusedInstanceContainerEntityId.IsValid()) + { + return m_focusedInstanceContainerEntityId; + } + + if (auto instance = GetReferenceFromContainerEntityId(m_focusedInstanceContainerEntityId); instance.has_value()) + { + return instance->get().GetContainerEntityId(); + } + + return AZ::EntityId(); } bool PrefabFocusHandler::IsOwningPrefabBeingFocused(AZ::EntityId entityId) const