diff --git a/lib/features/modeling/BpmnLayouter.js b/lib/features/modeling/BpmnLayouter.js
index 9ddf378f..81fb0b69 100644
--- a/lib/features/modeling/BpmnLayouter.js
+++ b/lib/features/modeling/BpmnLayouter.js
@@ -44,6 +44,12 @@ BpmnLayouter.prototype.layoutConnection = function(connection, layoutHints) {
     manhattanOptions = {
       preferredLayouts: [ 'straight', 'v:v' ]
     };
+
+    if (is(target, 'bpmn:Event')) {
+      manhattanOptions = {
+        preferredLayouts: [ 'v:v' ]
+      };
+    }
   } else
 
 
diff --git a/test/spec/features/modeling/layout/LayoutConnectionSpec.js b/test/spec/features/modeling/layout/LayoutConnectionSpec.js
index c716b146..820d1726 100644
--- a/test/spec/features/modeling/layout/LayoutConnectionSpec.js
+++ b/test/spec/features/modeling/layout/LayoutConnectionSpec.js
@@ -33,6 +33,7 @@ describe('features/modeling - layout connection', function() {
 
       // expect cropped, repaired connection
       // that was not actually modified
+
       var waypoints = [
         { original: { x: 578, y: 341 }, x: 578, y: 341 },
         { x: 934, y: 341 },
diff --git a/test/spec/features/modeling/layout/LayoutMessageFlowSpec.js b/test/spec/features/modeling/layout/LayoutMessageFlowSpec.js
index eb397b4e..594f89c7 100644
--- a/test/spec/features/modeling/layout/LayoutMessageFlowSpec.js
+++ b/test/spec/features/modeling/layout/LayoutMessageFlowSpec.js
@@ -71,9 +71,8 @@ describe('features/modeling - layout message flows', function() {
     // expect cropped, repaired manhattan connection
     expect(messageFlowConnection.waypoints).eql([
       { original: { x: 671, y: 214 }, x: 671, y: 214 },
-      { original: { x: 771, y: 465 }, x: 771, y: 465 }
+      { original: { x: 671, y: 465 }, x: 671, y: 465 }
     ]);
-
   }));