diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/JFXBaseRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/JFXBaseRepresentation.java
index c6ecdb754b..cd9493c545 100644
--- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/JFXBaseRepresentation.java
+++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/JFXBaseRepresentation.java
@@ -369,12 +369,14 @@ public void updateOrder()
      * @param children list of children nodes under the parent widget
      */
     public void setDisabledLook(Boolean enabled, ObservableList<Node> children) {
-        jfx_node.setCursor(enabled ? Cursor.DEFAULT : Cursors.NO_WRITE);
-        if (children != null) {
-            for (Node node : children)
-            {
-                Styles.update(node, Styles.NOT_ENABLED, !enabled);
-            }   
+        if (!toolkit.isEditMode()) {
+            jfx_node.setCursor(enabled ? Cursor.DEFAULT : Cursors.NO_WRITE);
+            if (children != null) {
+                for (Node node : children)
+                {
+                    Styles.update(node, Styles.NOT_ENABLED, !enabled);
+                }   
+            }
         }
     }
 }
diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java
index 6ae8f2c1a9..f0fa371ad4 100644
--- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java
+++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TextEntryRepresentation.java
@@ -9,6 +9,7 @@
 
 import static org.csstudio.display.builder.representation.ToolkitRepresentation.logger;
 
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
@@ -51,6 +52,8 @@ public class TextEntryRepresentation extends RegionBaseRepresentation<TextInputC
      */
     private boolean active = false;
     private volatile boolean enabled = true;
+    private final String node_id = UUID.randomUUID().toString();;
+
 
     private final DirtyFlag dirty_size = new DirtyFlag();
     private final DirtyFlag dirty_style = new DirtyFlag();
@@ -101,6 +104,7 @@ public TextInputControl createJFXNode() throws Exception
             text = new TextField();
         text.setMinSize(Region.USE_PREF_SIZE, Region.USE_PREF_SIZE);
         text.getStyleClass().add("text_entry");
+        text.setId(node_id);
 
         if (! toolkit.isEditMode())
         {
@@ -425,6 +429,13 @@ else if(jfx_node instanceof TextArea){
                 String alignment = model_widget.propHorizontalAlignment().getValue().toString().toLowerCase();
                 PseudoClass alignmentClass = PseudoClass.getPseudoClass(alignment);
                 jfx_node.pseudoClassStateChanged(alignmentClass, true);
+                
+                if (jfx_node.getScene() != null && !enabled) {
+                    // Need to get the TextArea 'content' node to set the cursor
+                    // for the whole widget otherwise it will only show on the borders.
+                    jfx_node.getScene().lookup("#"+node_id+" .content").setCursor(Cursors.NO_WRITE);
+                    jfx_node.layout();
+                }
             }
         }
         if (! active)