diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java
index e9c8f3556..6c032e811 100644
--- a/src/main/java/de/neemann/digital/gui/Main.java
+++ b/src/main/java/de/neemann/digital/gui/Main.java
@@ -1042,6 +1042,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
                     circuitComponent.setManualChangeObserver(new MicroStepObserver(model));
             }
         });
+        stateManager.setActualState(stoppedState);
     }
 
     private void clearModelDescription() {
diff --git a/src/main/java/de/neemann/digital/gui/components/modification/ModifyMoveSelected.java b/src/main/java/de/neemann/digital/gui/components/modification/ModifyMoveSelected.java
index ac1cd031f..46b3375c7 100644
--- a/src/main/java/de/neemann/digital/gui/components/modification/ModifyMoveSelected.java
+++ b/src/main/java/de/neemann/digital/gui/components/modification/ModifyMoveSelected.java
@@ -43,13 +43,15 @@ public class ModifyMoveSelected implements Modification {
     @Override
     public void modify(Circuit circuit, ElementLibrary library) {
         ArrayList<Movable> list = circuit.getElementsToMove(min, max);
-        for (Movable m : list)
-            m.move(accumulatedDelta);
+        if (list != null) {
+            for (Movable m : list)
+                m.move(accumulatedDelta);
 
-        for (int i = 0; i < accumulatedRotate; i++)
-            rotateElements(list, center);
+            for (int i = 0; i < accumulatedRotate; i++)
+                rotateElements(list, center);
 
-        circuit.elementsMoved();
+            circuit.elementsMoved();
+        }
     }
 
     /**
diff --git a/src/main/java/de/neemann/digital/gui/state/StateManager.java b/src/main/java/de/neemann/digital/gui/state/StateManager.java
index 2dd404fe7..b558e0ab9 100644
--- a/src/main/java/de/neemann/digital/gui/state/StateManager.java
+++ b/src/main/java/de/neemann/digital/gui/state/StateManager.java
@@ -48,4 +48,13 @@ public class StateManager {
     public boolean isActive(State state) {
         return actualState == state;
     }
+
+    /**
+     * Sets the actual state. Ony used to init the state manager
+     *
+     * @param active the state which is active.
+     */
+    public void setActualState(State active) {
+        this.actualState = active;
+    }
 }