diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
index 0b2685b328ff9f229799431d336e9a81d1aa7f88..e6aa355276720557dd9d1166f4b7c59f0c90a6cc 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
@@ -6,6 +6,6 @@ DefaultDiagramController.java 0e083b89a08f63967102a384d66ebc1d64d203af GREEN
 DelegatingContentAnchorageController.java 2e3b1b4e14402a3503233f816b21ef3e4aa09edc GREEN
 DragControllerBase.java b15ff874304f679fe494d85f57cc8cbe4d0d1d15 GREEN
 DraggingUtils.java 95117e2ea4c36b6c6a31f8088bb95b484e0e6612 GREEN
-LinkControllerBase.java 4b6239c10cbbc5a2226615f7c6775f11adf226ef GREEN
+LinkControllerBase.java c2232100230997f1ba7f2686a2f0626f85d223ed YELLOW
 MoveControllerBase.java 38d632e31f5e27d112ecdd4933e3a331378180d0 GREEN
 ResizableContentControllerBase.java 898500d389b035f8138308d496d2d24be501c719 GREEN
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/LinkControllerBase.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/LinkControllerBase.java
index 4b6239c10cbbc5a2226615f7c6775f11adf226ef..c2232100230997f1ba7f2686a2f0626f85d223ed 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/LinkControllerBase.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/LinkControllerBase.java
@@ -270,6 +270,10 @@ public abstract class LinkControllerBase extends MVCBundlePartBase implements IC
 		DiagramViewerSelection selection = getViewer().getSelection();
 		ILinkMVCBundle linkBundle = getMVCBundle();
 		if(selection.getPrimarySelection() == linkBundle) {
+			// Only bend-point handles create drag controllers
+			if(!getLinkVisual().isBendPointHandle(node)) {
+				return null;
+			}
 			// links with primary selection show move handles
 			ILinkVisual linkVisual = getLinkVisual();
 			int bpIndex = linkVisual.getBendPointIndex(node);