diff --git a/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java b/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java
index f41ab5b94..ca6727445 100644
--- a/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java
+++ b/src/main/java/de/neemann/digital/draw/library/ElementLibrary.java
@@ -583,7 +583,7 @@ public class ElementLibrary implements Iterable<ElementLibrary.ElementContainer>
             }
 
             ElementTypeDescriptionCustom description = createCustomDescription(file, circuit, this);
-            description.setShortName(createShortName(file));
+            description.setShortName(createShortName(file.getName(), circuit.getAttributes().getLabel()));
 
             String descriptionText = Lang.evalMultilingualContent(circuit.getAttributes().get(Keys.DESCRIPTION));
             if (descriptionText != null && descriptionText.length() > 0) {
@@ -595,18 +595,18 @@ public class ElementLibrary implements Iterable<ElementLibrary.ElementContainer>
         }
     }
 
-    private String createShortName(File file) {
-        return createShortName(file.getName());
-    }
+    private String createShortName(String name, String userDefined) {
+        if (userDefined.isEmpty()) {
+            if (name.endsWith(".dig")) return "\\" + name.substring(0, name.length() - 4);
 
-    private String createShortName(String name) {
-        if (name.endsWith(".dig")) return "\\" + name.substring(0, name.length() - 4);
-
-        String transName = Lang.getNull("elem_" + name);
-        if (transName == null)
-            return name;
-        else
-            return transName;
+            String transName = Lang.getNull("elem_" + name);
+            if (transName == null)
+                return name;
+            else
+                return transName;
+        } else {
+            return userDefined;
+        }
     }
 
     /**
diff --git a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
index b8ec3d221..b71f6b516 100644
--- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
+++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
@@ -62,6 +62,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
     private static final ArrayList<Key> ATTR_LIST = new ArrayList<>();
 
     static {
+        ATTR_LIST.add(Keys.LABEL);
         ATTR_LIST.add(Keys.WIDTH);
         ATTR_LIST.add(Keys.SHAPE_TYPE);
         ATTR_LIST.add(Keys.CUSTOM_SHAPE);