diff --git a/org.eclipse.gef.mvc.examples.logo/src/org/eclipse/gef/mvc/examples/logo/model/GeometricCurve.java b/org.eclipse.gef.mvc.examples.logo/src/org/eclipse/gef/mvc/examples/logo/model/GeometricCurve.java
index fac6f5fe9..c60d5ef2c 100644
--- a/org.eclipse.gef.mvc.examples.logo/src/org/eclipse/gef/mvc/examples/logo/model/GeometricCurve.java
+++ b/org.eclipse.gef.mvc.examples.logo/src/org/eclipse/gef/mvc/examples/logo/model/GeometricCurve.java
@@ -62,7 +62,7 @@ public class GeometricCurve extends AbstractGeometricElement<ICurve> {
 	private final ObjectProperty<Decoration> targetDecorationProperty = new SimpleObjectProperty<>(this,
 			TARGET_DECORATION_PROPERTY, Decoration.NONE);
 	private final ObjectProperty<RoutingStyle> routingStyleProperty = new SimpleObjectProperty<>(this,
-			ROUTING_STYLE_PROPERTY, RoutingStyle.STRAIGHT);
+			ROUTING_STYLE_PROPERTY, RoutingStyle.ORTHOGONAL);
 	private final ReadOnlyListWrapperEx<Double> dashesProperty = new ReadOnlyListWrapperEx<>(this, DASHES_PROPERTY,
 			CollectionUtils.<Double> observableArrayList());
 	private final Set<AbstractGeometricElement<? extends IGeometry>> sourceAnchorages = new HashSet<>();
diff --git a/org.eclipse.gef.mvc.fx/src/org/eclipse/gef/mvc/fx/handlers/BendFirstAnchorageOnSegmentHandleDragHandler.java b/org.eclipse.gef.mvc.fx/src/org/eclipse/gef/mvc/fx/handlers/BendFirstAnchorageOnSegmentHandleDragHandler.java
index 29debfca6..4661f28e3 100644
--- a/org.eclipse.gef.mvc.fx/src/org/eclipse/gef/mvc/fx/handlers/BendFirstAnchorageOnSegmentHandleDragHandler.java
+++ b/org.eclipse.gef.mvc.fx/src/org/eclipse/gef/mvc/fx/handlers/BendFirstAnchorageOnSegmentHandleDragHandler.java
@@ -408,6 +408,7 @@ public class BendFirstAnchorageOnSegmentHandleDragHandler
 		bendPolicy = determineBendPolicy();
 		init(bendPolicy);
 
+		updateHandles();
 		prepareBend(e.isShiftDown(), bendPolicy);
 		// move initially so that the initial positions for the selected
 		// points are computed