diff --git a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/DisplayEditor.java b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/DisplayEditor.java
index cb4b464f8e..5727190972 100644
--- a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/DisplayEditor.java
+++ b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/DisplayEditor.java
@@ -199,7 +199,7 @@ public DisplayEditor(final JFXRepresentation toolkit, final int stack_size)
     public Parent create ()
     {
         model_root = toolkit.createModelRoot();
-        model_root.getStyleClass().add("widget_pane_unfocused");
+        model_root.getStyleClass().add("widget_pane");
         autoScrollHandler = new AutoScrollHandler(model_root);
 
         final Group scroll_body = (Group) model_root.getContent();
@@ -225,13 +225,6 @@ public Parent create ()
         setSnap(prefs.getBoolean(SNAP_WIDGETS, true));
         setCoords(prefs.getBoolean(SHOW_COORDS, true));
 
-        model_root.focusedProperty().addListener((observableValue, aBoolean, focused) -> {
-            if (focused) {
-                model_root.getStyleClass().add("widget_pane_focused");
-            } else {
-                model_root.getStyleClass().remove("widget_pane_focused");
-            }
-        });
         return root;
     }
 
diff --git a/app/display/editor/src/main/resources/org/csstudio/display/builder/editor/opieditor.css b/app/display/editor/src/main/resources/org/csstudio/display/builder/editor/opieditor.css
index 16444339ca..c52bd0c3bf 100644
--- a/app/display/editor/src/main/resources/org/csstudio/display/builder/editor/opieditor.css
+++ b/app/display/editor/src/main/resources/org/csstudio/display/builder/editor/opieditor.css
@@ -180,11 +180,11 @@
 	-fx-snap-to-pixel: false
 }
 
-.widget_pane_unfocused{
+.widget_pane{
     -fx-border-color: #F4F4F4;
 }
 
-.widget_pane_focused{
+.widget_pane:focused{
     -fx-border-color: #00A0D8;
 }