diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
index 1c72ae35adf7f3cf10fdb5c535387e158af03dee..1444ceeabb5c58e56001d338a4bf3bd1737b064c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
@@ -20,6 +20,7 @@ package org.fortiss.tooling.base.ui.editpart;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.editparts.AbstractConnectionEditPart;
 import org.fortiss.tooling.base.model.element.IConnection;
 import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
@@ -90,4 +91,16 @@ public abstract class ConnectionEditPartBase<T extends ILayoutedModelElement & I
 	public T getModelElement() {
 		return modelElement;
 	}
+
+	/** {@inheritDoc} */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		// EObjectSelectionUtils requires us to adapt to EObject, since
+		// graphical edit parts can be provided as selection as well.
+		if (key == EObject.class) {
+			return modelElement;
+		}
+		return super.getAdapter(key);
+	}
 }