diff --git a/src/main/java/de/neemann/digital/gui/components/AttributeDialog.java b/src/main/java/de/neemann/digital/gui/components/AttributeDialog.java
index 17a6deb31..7818b8b81 100644
--- a/src/main/java/de/neemann/digital/gui/components/AttributeDialog.java
+++ b/src/main/java/de/neemann/digital/gui/components/AttributeDialog.java
@@ -71,9 +71,9 @@ public class AttributeDialog extends JDialog {
 
         topMostTextComponent = null;
         for (Key key : list) {
-            Editor e = EditorFactory.INSTANCE.create(key, elementAttributes.get(key));
+            Editor e = EditorFactory.INSTANCE.create(key, modifiedAttributes.get(key));
             editors.add(new EditorHolder(e, key));
-            e.addToPanel(panel, key, elementAttributes, this);
+            e.addToPanel(panel, key, modifiedAttributes, this);
 
             if (topMostTextComponent == null && e instanceof EditorFactory.StringEditor)
                 topMostTextComponent = ((EditorFactory.StringEditor) e).getTextComponent();