diff --git a/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java
index 6a0bb3ee8eb8..d3c1c501007d 100644
--- a/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java
+++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java
@@ -120,6 +120,8 @@ public abstract class AbstractTreeNode<T> extends PresentableNodeDescriptor<Abst
   }
 
   public boolean equals(Object object) {
+    if (object == this) return true;
+    if (object == null || !object.getClass().equals(getClass())) return false;
     // we should not change this behaviour if value is set to null
     return object instanceof AbstractTreeNode && Comparing.equal(myValue, ((AbstractTreeNode)object).myValue);
   }
diff --git a/plugins/properties/src/com/intellij/lang/properties/projectView/CustomResourceBundlePropertiesFileNode.java b/plugins/properties/src/com/intellij/lang/properties/projectView/CustomResourceBundlePropertiesFileNode.java
index 33007793b92c..22c66e9d4474 100644
--- a/plugins/properties/src/com/intellij/lang/properties/projectView/CustomResourceBundlePropertiesFileNode.java
+++ b/plugins/properties/src/com/intellij/lang/properties/projectView/CustomResourceBundlePropertiesFileNode.java
@@ -31,14 +31,6 @@ public class CustomResourceBundlePropertiesFileNode extends PsiFileNode implemen
     data.setLocationString(PropertiesBundle.message("project.view.resource.bundle.tree.node.text", getResourceBundle().getBaseName()));
   }
 
-  @Override
-  public boolean equals(Object object) {
-    if (!(object instanceof CustomResourceBundlePropertiesFileNode)) {
-      return false;
-    }
-    return Comparing.equal(getValue(), ((CustomResourceBundlePropertiesFileNode)object).getValue());
-  }
-
   @NotNull
   @Override
   public ResourceBundle getResourceBundle() {