diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
index 066bc3695a9a3035d87c0017bc71dd5ab5ea35ef..410cde77ecaf9961d47c7124bc899b2e2645e048 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
@@ -7,7 +7,7 @@ EReferencePropertySectionBase.java 0548da6778516003257f59d0b4c2b60d458be3b6 GREE
 EditorBase.java 9c09fff92945256bb8680992ae7bb2c78f47b150 GREEN
 FXEditorBase.java 2e520be0bbae7d0aebdff70218a124dbe0896ce2 GREEN
 IListPropertySection.java 8bb00fe7959583e794ff9437b7a77404c9a9e70f GREEN
-LWFXEFEditorBase.java 121fd466f47bbfe0236834db1ad30efae6db219a GREEN
+LWFXEFEditorBase.java 2bd06235f20c18dc2e7d433700b2ad74a16664e2 YELLOW
 ModelEditorBindingBase.java c258cb0ea28d74440856cd2abf367408fbbc1279 GREEN
 ModelElementHandlerBase.java 384727748f125c9d43f19d9c0eba4ba1be5a7a26 GREEN
 MultiEObjectActionBase.java 9e237d8ea640c4194e4877af4a9cfce88698e543 GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/LWFXEFEditorBase.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/LWFXEFEditorBase.java
index 121fd466f47bbfe0236834db1ad30efae6db219a..2bd06235f20c18dc2e7d433700b2ad74a16664e2 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/LWFXEFEditorBase.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/LWFXEFEditorBase.java
@@ -87,7 +87,8 @@ public abstract class LWFXEFEditorBase<T extends EObject> extends FXEditorBase<T
 	protected void constructMVCFactories() {
 		List<IModelEditorBinding<EObject>> bindings =
 				IModelEditorBindingService.getInstance().getBindings(editedObject);
-		bindings.removeIf(b -> !LWFXEFEditorBase.class.isAssignableFrom(b.getEditorClass(null)));
+		bindings.removeIf(b -> (b.getEditorClass(editedObject) != null) &&
+				(!LWFXEFEditorBase.class.isAssignableFrom(b.getEditorClass(editedObject))));
 
 		List<Class<? extends IModelFactory>> modelFactories = bindings.stream()
 				.map(b -> b.getModelFactory()).filter(Objects::nonNull).collect(toList());