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 48dc151a3..518923243 100644
--- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
+++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
@@ -1335,7 +1335,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
 
         @Override
         public void mousePressed(MouseEvent e) {
-            hadFocusAtClick = hasFocus();
+            hadFocusAtClick = SwingUtilities.getWindowAncestor(CircuitComponent.this).isFocused();
             pos = new Vector(e.getX(), e.getY());
             isMoved = false;
             requestFocusInWindow();