diff --git a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp index 24dfcf4ff6..f97d4e913e 100644 --- a/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp +++ b/Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp @@ -462,6 +462,13 @@ namespace LandscapeCanvasEditor CrySystemEventBus::Handler::BusConnect(); AZ::EntitySystemBus::Handler::BusConnect(); + // Listen for Entity notifications if a level is already loaded + // Otherwise, we will connect/disconnect from this bus when levels are loaded/closed + if (GetLegacyEditor()->IsLevelLoaded()) + { + AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect(); + } + // Create our temporary Node Inspector using a Pinned Inspector m_customNodeInspector = aznew CustomNodeInspectorDockWidget(this);