diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java
index a153fa52e5..c2573625a0 100644
--- a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java
+++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/EmbeddedDisplayWidget.java
@@ -113,6 +113,11 @@ public EnumWidgetProperty<Resize> createProperty(final Widget widget,
     static final WidgetPropertyDescriptor<String> propGroupName =
         CommonWidgetProperties.newStringPropertyDescriptor(
             WidgetPropertyCategory.DISPLAY, "group_name", Messages.EmbeddedDisplayWidget_GroupName);
+    /**
+     * 'rotation' property
+     */
+     static final WidgetPropertyDescriptor<Double> propRotation =
+            CommonWidgetProperties.newDoublePropertyDescriptor(WidgetPropertyCategory.DISPLAY, "rotation", Messages.WidgetProperties_Rotation);
 
     /** 'embedded_model' */
     public static final WidgetPropertyDescriptor<DisplayModel> runtimeModel =
@@ -279,6 +284,7 @@ private void createGroupWrapper(final Widget widget, final Element embedded_xml,
     private volatile WidgetProperty<String> group_name;
     private volatile WidgetProperty<DisplayModel> embedded_model;
     private volatile WidgetProperty<Boolean> transparent;
+    private volatile WidgetProperty<Double> rotation;
 
     /** Constructor */
     public EmbeddedDisplayWidget()
@@ -295,6 +301,7 @@ protected void defineProperties(final List<WidgetProperty<?>> properties)
         properties.add(group_name = propGroupName.createProperty(this, ""));
         properties.add(embedded_model = runtimeModel.createProperty(this, null));
         properties.add(transparent = propTransparent.createProperty(this, false));
+        properties.add(rotation = propRotation.createProperty(this, 0.0));
         BorderSupport.addBorderProperties(this, properties);
     }
 
@@ -344,6 +351,12 @@ public WidgetProperty<Boolean> propTransparent()
         return transparent;
     }
 
+    /** @return 'rotation' property */
+    public WidgetProperty<Double> propRotation()
+    {
+        return rotation;
+    }
+
     @Override
     public WidgetConfigurator getConfigurator(Version persisted_version)
             throws Exception
diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/EmbeddedDisplayRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/EmbeddedDisplayRepresentation.java
index 14b8cb6b5a..c5856785a4 100644
--- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/EmbeddedDisplayRepresentation.java
+++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/EmbeddedDisplayRepresentation.java
@@ -16,6 +16,9 @@
 import java.util.logging.Level;
 
 import javafx.application.Platform;
+import javafx.collections.ObservableList;
+import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Transform;
 import org.csstudio.display.builder.model.DirtyFlag;
 import org.csstudio.display.builder.model.DisplayModel;
 import org.csstudio.display.builder.model.UntypedWidgetPropertyListener;
@@ -87,7 +90,7 @@ public class EmbeddedDisplayRepresentation extends RegionBaseRepresentation<Pane
 
     private volatile double zoom_factor_x = 1.0;
     private volatile double zoom_factor_y = 1.0;
-
+    private volatile double rotate = 0;
 
     /** Inner pane that holds child widgets
      *
@@ -99,6 +102,8 @@ public class EmbeddedDisplayRepresentation extends RegionBaseRepresentation<Pane
 
     /** Zoom for 'inner' pane */
     private Scale zoom;
+    /** Rotation for 'inner' pane */
+    private Rotate rotation;
 
     /** Optional scroll pane between 'jfx_node' Pane and 'inner'.
      *
@@ -143,7 +148,10 @@ public Pane createJFXNode() throws Exception
         // Using a separate Scale transformation does not have that problem.
         // See http://stackoverflow.com/questions/10707880/javafx-scale-and-translate-operation-results-in-anomaly
         inner = new Pane();
-        inner.getTransforms().add(zoom = new Scale());
+
+        ObservableList<Transform> innerTransforms = inner.getTransforms();
+        innerTransforms.add(zoom = new Scale());
+        innerTransforms.add(rotation = new Rotate(0, 0, 0));
 
         scroll = new NonCachingScrollPane(inner);
         scroll.setHbarPolicy(ScrollBarPolicy.AS_NEEDED);
@@ -175,13 +183,13 @@ protected void registerListeners()
         model_widget.propWidth().addUntypedPropertyListener(sizesChangedListener);
         model_widget.propHeight().addUntypedPropertyListener(sizesChangedListener);
         model_widget.propResize().addUntypedPropertyListener(sizesChangedListener);
+        model_widget.propRotation().addUntypedPropertyListener(sizesChangedListener);
 
         model_widget.propFile().addUntypedPropertyListener(fileChangedListener);
         model_widget.propGroupName().addUntypedPropertyListener(fileChangedListener);
         model_widget.propMacros().addUntypedPropertyListener(fileChangedListener);
 
         model_widget.propTransparent().addUntypedPropertyListener(backgroundChangedListener);
-
         fileChanged(null, null, null);
     }
 
@@ -191,10 +199,12 @@ protected void unregisterListeners()
         model_widget.propWidth().removePropertyListener(sizesChangedListener);
         model_widget.propHeight().removePropertyListener(sizesChangedListener);
         model_widget.propResize().removePropertyListener(sizesChangedListener);
+        model_widget.propRotation().removePropertyListener(sizesChangedListener);
         model_widget.propFile().removePropertyListener(fileChangedListener);
         model_widget.propGroupName().removePropertyListener(fileChangedListener);
         model_widget.propMacros().removePropertyListener(fileChangedListener);
         model_widget.propTransparent().removePropertyListener(backgroundChangedListener);
+
         super.unregisterListeners();
     }
 
@@ -233,6 +243,13 @@ else if (resize == Resize.StretchContent)
                 zoom_factor_x = content_width  > 0 ? (double) widget_width  / content_width : 1.0;
                 zoom_factor_y = content_height > 0 ? (double) widget_height / content_height : 1.0;
             }
+
+            // Apply the rotation
+            rotate=model_widget.propRotation().getValue();
+            rotation.setAngle(rotate);
+            rotation.setPivotX((double)content_width / 2);
+            rotation.setPivotY((double) content_height / 2);
+
         }
 
         dirty_sizes.mark();