diff --git a/editor/src/panels/InspectorPanel.cpp b/editor/src/panels/InspectorPanel.cpp
index 80c8b4f0..67d2b16b 100644
--- a/editor/src/panels/InspectorPanel.cpp
+++ b/editor/src/panels/InspectorPanel.cpp
@@ -71,6 +71,9 @@ void InspectorPanel::OnDetach() {
 
 void InspectorPanel::OnSelectionChanged(const SelectionChangedEvent& event) {
     Actions::HandleInspectorSelectionChanged(*m_context, event, m_selectedEntityId, m_addComponentPopup);
+    if (event.primarySelection != 0) {
+        m_lastExplicitRoute = EditorActionRoute::Hierarchy;
+    }
 }
 
 void InspectorPanel::Render() {