diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java
index 0a99fa9c40d3..e1f4cc53d28b 100644
--- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java
+++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java
@@ -58,7 +58,7 @@ public class ResourceBundlePropertyStructureViewElement implements StructureView
   }
 
   public IProperty getProperty() {
-    return myProperty;
+    return myProperty.getPsiElement().isValid() ? myProperty : null;
   }
 
   @NotNull