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 e567404be..0d3be0b62 100644
--- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
+++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
@@ -1294,7 +1294,7 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
         if (list.size() == 1)
             vp = list.get(0);
         else if (list.size() > 1) {
-            ItemPicker<VisualElement> picker = new ItemPicker<>(CircuitComponent.this, list);
+            ItemPicker<VisualElement> picker = new ItemPicker<>(parent, list);
             vp = picker.select();
         }
         return vp;
diff --git a/src/main/java/de/neemann/digital/gui/components/ItemPicker.java b/src/main/java/de/neemann/digital/gui/components/ItemPicker.java
index 4d20b02a4..10172e444 100644
--- a/src/main/java/de/neemann/digital/gui/components/ItemPicker.java
+++ b/src/main/java/de/neemann/digital/gui/components/ItemPicker.java
@@ -28,7 +28,7 @@ public class ItemPicker<T> extends JDialog {
      * @param parent the parent frame
      * @param items  the list of items
      */
-    public ItemPicker(Component parent, final java.util.List<T> items) {
+    public ItemPicker(Window parent, final java.util.List<T> items) {
         this(parent, Lang.get("win_itempicker_title"), items);
     }
 
@@ -39,8 +39,8 @@ public class ItemPicker<T> extends JDialog {
      * @param title  title of the dialog
      * @param items  the list of items
      */
-    public ItemPicker(Component parent, final String title, final java.util.List<T> items) {
-        super(SwingUtilities.getWindowAncestor(parent), title, ModalityType.APPLICATION_MODAL);
+    public ItemPicker(Window parent, final String title, final java.util.List<T> items) {
+        super(parent, title, ModalityType.APPLICATION_MODAL);
         this.items = items;
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);