diff --git a/src/main/java/de/neemann/digital/draw/elements/Circuit.java b/src/main/java/de/neemann/digital/draw/elements/Circuit.java
index eb222ee27..6d873d0b9 100644
--- a/src/main/java/de/neemann/digital/draw/elements/Circuit.java
+++ b/src/main/java/de/neemann/digital/draw/elements/Circuit.java
@@ -215,7 +215,8 @@ public class Circuit implements Copyable<Circuit> {
      */
     public Circuit createShallowCopy() {
         Circuit circuit = new Circuit();
-        circuit.attributes = new ElementAttributes(attributes);
+        if (attributes != null)
+            circuit.attributes = new ElementAttributes(attributes);
         circuit.wires.addAll(wires);
         circuit.visualElements.addAll(visualElements);
         return circuit;
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 58b787164..826c25222 100644
--- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
+++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
@@ -125,7 +125,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
     private AffineTransform transform = new AffineTransform();
     private Observer manualChangeObserver;
     private Vector lastMousePos;
-    private SyncAccess modelSync;
+    private SyncAccess modelSync = SyncAccess.NOSYNC;
     private boolean isManualScale;
     private boolean graphicsHasChanged = true;
     private boolean focusWasLost = false;
@@ -264,6 +264,8 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
         addMouseMotionListener(dispatcher);
         addMouseListener(dispatcher);
 
+        mouseNormal.activate();
+
         setToolTipText("");
     }