diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java b/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java
index 4f171d88064b..6b6cadbb0170 100644
--- a/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java
+++ b/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java
@@ -524,16 +524,12 @@ public abstract class PropertyTable extends JBTable {
   }
 
   public static int findProperty(List<Property> properties, Property property) {
-    int index = properties.indexOf(property);
-    if (index != -1) {
-      return index;
-    }
-
     String name = property.getName();
     int size = properties.size();
 
     for (int i = 0; i < size; i++) {
-      if (name.equals(properties.get(i).getName())) {
+      Property nextProperty = properties.get(i);
+      if (Comparing.equal(nextProperty.getGroup(), property.getGroup()) && name.equals(nextProperty.getName())) {
         return i;
       }
     }