diff --git a/source/com/intellij/ide/commander/CommanderPanel.java b/source/com/intellij/ide/commander/CommanderPanel.java
index ea44bef18f55..4494018077f7 100644
--- a/source/com/intellij/ide/commander/CommanderPanel.java
+++ b/source/com/intellij/ide/commander/CommanderPanel.java
@@ -226,8 +226,9 @@ public class CommanderPanel extends JPanel {
     final AbstractTreeNode selectedNode = getSelectedNode();
     if (selectedNode != null) {
       final Object value = selectedNode.getValue();
-      if (value instanceof Navigatable && ((Navigatable)value).canNavigate()) {
-        ((Navigatable)value).navigate(true);
+      if (selectedNode.canNavigate()) {
+        selectedNode.navigate(true);
+        return true;
       }
     }
     return false;