diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
index 434d89be01bf1fa9d07ef7d72edd3baf9d32c8fd..ddc5a1c69bdb439cc5e16e7d320dfdffebd1bc1c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
@@ -100,7 +100,7 @@ public abstract class AnnotationViewPartBase extends ViewPart implements ISelect
 		if(currentlySelectedObject == null) {
 			ElementEditPartBase<?> editPart =
 					SelectionUtils.checkAndPickFirst(selection, ElementEditPartBase.class);
-			if(editPart != null) {
+			if(editPart != null && editPart.getModel() instanceof IModelElement) {
 				currentlySelectedObject = (IModelElement)editPart.getModel();
 			} else {
 				// Not all editors are derived from ElementEditPartBase, most notably