diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ProgressBarRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ProgressBarRepresentation.java
index 2aa9b529dc..09d8a665b1 100644
--- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ProgressBarRepresentation.java
+++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ProgressBarRepresentation.java
@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.csstudio.display.builder.representation.javafx.widgets;
 
+import javafx.scene.layout.Pane;
 import org.csstudio.display.builder.model.DirtyFlag;
 import org.csstudio.display.builder.model.UntypedWidgetPropertyListener;
 import org.csstudio.display.builder.model.WidgetProperty;
@@ -28,7 +29,7 @@
  *  @author Amanda Carpenter
  */
 @SuppressWarnings("nls")
-public class ProgressBarRepresentation extends RegionBaseRepresentation<ProgressBar, ProgressBarWidget>
+public class ProgressBarRepresentation extends RegionBaseRepresentation<Pane, ProgressBarWidget>
 {
     private final DirtyFlag dirty_look = new DirtyFlag();
     private final DirtyFlag dirty_value = new DirtyFlag();
@@ -39,11 +40,13 @@ public class ProgressBarRepresentation extends RegionBaseRepresentation<Progress
 
     private volatile double percentage = 0.0;
 
+    private ProgressBar bar;
+
     @Override
-    public ProgressBar createJFXNode() throws Exception
+    public Pane createJFXNode() throws Exception
     {
-        final ProgressBar bar = new ProgressBar();
-        return bar;
+        bar = new ProgressBar();
+        return new Pane(bar);
     }
 
     @Override
@@ -172,6 +175,10 @@ else if (percentage > 1.0)
         toolkit.scheduleUpdate(this);
     }
 
+    @Override
+    protected boolean isFilteringEditModeClicks() {
+        return true;
+    }
 
     @Override
     public void updateChanges()
@@ -187,29 +194,31 @@ public void updateChanges()
 
             if (!horizontal)
             {
-                jfx_node.getTransforms().setAll(
+                bar.getTransforms().setAll(
                     new Translate(0, height),
                     new Rotate(-90, 0, 0));
-                jfx_node.setPrefSize(height, width);
+                bar.setPrefSize(height, width);
+                jfx_node.setPrefSize(width, height);
 
                 if (min_val > max_val) 
                 {
-                    jfx_node.getTransforms().setAll(
+                    bar.getTransforms().setAll(
                         new Translate(0, height),
                         new Rotate(-90, 0, 0, 0),
                         new Translate(height, 0),
                         new Rotate(180, 0, 0, 0, Rotate.Y_AXIS));
-                    jfx_node.setPrefSize(height, width);
+                    bar.setPrefSize(height, width);
                 }
             }
             else
             {
-                jfx_node.getTransforms().clear();
+                bar.getTransforms().clear();
+                bar.setPrefSize(width, height);
                 jfx_node.setPrefSize(width, height);
 
                 if (min_val > max_val)
                 {
-                    jfx_node.getTransforms().setAll(
+                    bar.getTransforms().setAll(
                         new Translate(width, 0),
                         new Rotate(180, 0, 0, 0, Rotate.Y_AXIS));
                 }
@@ -259,6 +268,6 @@ public void updateChanges()
             jfx_node.setStyle(style.toString());
         }
         if (dirty_value.checkAndClear())
-            jfx_node.setProgress(percentage);
+            bar.setProgress(percentage);
     }
 }