diff --git a/jbpm-designer-client/src/main/resources/org/jbpm/designer/public/stencilsets/bpmn2.0jbpm/stencildata/bpmn2.0jbpm.orig b/jbpm-designer-client/src/main/resources/org/jbpm/designer/public/stencilsets/bpmn2.0jbpm/stencildata/bpmn2.0jbpm.orig
index 33243dccb5..fde55c79ef 100644
--- a/jbpm-designer-client/src/main/resources/org/jbpm/designer/public/stencilsets/bpmn2.0jbpm/stencildata/bpmn2.0jbpm.orig
+++ b/jbpm-designer-client/src/main/resources/org/jbpm/designer/public/stencilsets/bpmn2.0jbpm/stencildata/bpmn2.0jbpm.orig
@@ -9665,7 +9665,6 @@
                     "from_task_event",
                     "to_task_event",
                     "EventSubprocess",
-                    "TextAnnotation",
                     "from_participant"
                 ]
 			},
@@ -9732,7 +9731,8 @@
 			},
 			{
 				"role": "TextAnnotationMorph",
-				"baseMorphs": ["TextAnnotation"]
+				"baseMorphs": ["TextAnnotation"],
+                "preserveBounds" : true
 			},
 			{
 				"role": "DataObjectMorph",