diff --git a/release/scripts/mgear/shifter/guide_explorer/guide_tree_widget.py b/release/scripts/mgear/shifter/guide_explorer/guide_tree_widget.py
index 74e4d379..4dd72f9e 100644
--- a/release/scripts/mgear/shifter/guide_explorer/guide_tree_widget.py
+++ b/release/scripts/mgear/shifter/guide_explorer/guide_tree_widget.py
@@ -722,11 +722,17 @@ def _on_scene_selection_changed(self, *args: Any) -> None:
             return
 
         selection = shifter_utils.get_selection()
-        if not selection:
+
+        # -- Filter out component selections
+        dag_selection = []
+        for item in selection:
+            if hasattr(item, "isDag") and item.isDag():
+                dag_selection.append(item)
+        if not dag_selection:
             return
 
         # -- Take the last selected object
-        last_item = selection[-1]
+        last_item = dag_selection[-1]
 
         # -- Try to find the component root for this object
         comp_root = shifter_utils.find_component_root(last_item)