diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
index 26b9e89ec0e4..c10f98833d6d 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
@@ -534,6 +534,8 @@ public class FileStructurePopup implements Disposable {
     new ClickListener() {
       @Override
       public boolean onClick(MouseEvent e, int clickCount) {
+        final TreePath path = myTree.getPathForLocation(e.getX(), e.getY());
+        if (path == null) return false; // user wants to expand/collapse a node
         navigateSelectedElement();
         return true;
       }