diff --git a/platform/platform-impl/src/com/intellij/designer/model/Property.java b/platform/platform-impl/src/com/intellij/designer/model/Property.java
index 9f902c8f864e..8c6d85fbf03b 100644
--- a/platform/platform-impl/src/com/intellij/designer/model/Property.java
+++ b/platform/platform-impl/src/com/intellij/designer/model/Property.java
@@ -170,6 +170,10 @@ public abstract class Property<T extends PropertiesContainer> {
   @Nullable
   public abstract PropertyEditor getEditor();
 
+  public boolean isEditable(@Nullable T component) {
+    return getEditor() != null;
+  }
+
   //////////////////////////////////////////////////////////////////////////////////////////
   //
   // Javadoc
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 e8deef934e8e..8a101141a3f5 100644
--- a/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java
+++ b/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java
@@ -1057,7 +1057,7 @@ public abstract class PropertyTable extends JBTable {
     }
 
     public boolean isCellEditable(int row, int column) {
-      return column == 1 && myProperties.get(row).getEditor() != null;
+      return column == 1 && myProperties.get(row).isEditable(getCurrentComponent());
     }
 
     @Override