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 5e1a19b94..98e05fa67 100644
--- a/src/main/java/de/neemann/digital/gui/components/AttributeDialog.java
+++ b/src/main/java/de/neemann/digital/gui/components/AttributeDialog.java
@@ -98,6 +98,7 @@ public class AttributeDialog extends JDialog {
         getRootPane().registerKeyboardAction(cancel,
                 KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
                 JComponent.WHEN_IN_FOCUSED_WINDOW);
+        setAlwaysOnTop(true);
     }
 
     /**
diff --git a/src/main/java/de/neemann/digital/gui/components/SingleValueDialog.java b/src/main/java/de/neemann/digital/gui/components/SingleValueDialog.java
index 06c2302bd..39b1e5bf7 100644
--- a/src/main/java/de/neemann/digital/gui/components/SingleValueDialog.java
+++ b/src/main/java/de/neemann/digital/gui/components/SingleValueDialog.java
@@ -106,6 +106,7 @@ public final class SingleValueDialog extends JDialog {
         setLocation(pos.x, pos.y);
         textField.requestFocus();
         textField.select(0, Integer.MAX_VALUE);
+        setAlwaysOnTop(true);
     }
 
     private JPanel createCheckBoxPanel(int bits, long value) {