diff --git a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/app/DisplayEditorInstance.java b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/app/DisplayEditorInstance.java
index 1d2b607c42..a49eefbe7f 100644
--- a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/app/DisplayEditorInstance.java
+++ b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/app/DisplayEditorInstance.java
@@ -80,9 +80,15 @@ public class DisplayEditorInstance implements AppInstance
 
     private final WidgetPropertyListener<String> model_name_listener = (property, old_value, new_value) ->
     {
-        final String label = EditorUtil.isDisplayReadOnly(property.getWidget().checkDisplayModel())
-            ? "[R/O] " + property.getValue()
-            : "[Edit] " + property.getValue();
+    	String fileName = property.getWidget().checkDisplayModel().getDisplayName();
+
+    	String value = (property.getValue() == null || property.getValue().isEmpty())
+    	        ? fileName
+    	        : property.getValue();
+
+    	final String label = EditorUtil.isDisplayReadOnly(property.getWidget().checkDisplayModel())
+    	        ? "[R/O] " + value
+    	        : "[Edit] " + value;
         Platform.runLater(() -> dock_item.setLabel(label));
     };
 
diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/DisplayModel.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/DisplayModel.java
index fafff17280..9c4f5e9a6c 100644
--- a/app/display/model/src/main/java/org/csstudio/display/builder/model/DisplayModel.java
+++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/DisplayModel.java
@@ -173,6 +173,8 @@ public String getDisplayName()
             name = getUserData(USER_DATA_INPUT_FILE);
             if (name == null)
                 name = "<No name>";
+            else
+                name= new java.io.File(name).getName();;
         }
         return name;
     }
diff --git a/app/display/model/src/main/resources/examples/initial.bob b/app/display/model/src/main/resources/examples/initial.bob
index 373ebaa445..395243ce17 100644
--- a/app/display/model/src/main/resources/examples/initial.bob
+++ b/app/display/model/src/main/resources/examples/initial.bob
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>Display</name>
+  <name></name>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <class>TITLE</class>