diff --git a/src/main/java/de/neemann/digital/core/SyncAccess.java b/src/main/java/de/neemann/digital/core/SyncAccess.java
index 9a763491e..dde025886 100644
--- a/src/main/java/de/neemann/digital/core/SyncAccess.java
+++ b/src/main/java/de/neemann/digital/core/SyncAccess.java
@@ -41,7 +41,8 @@ public interface SyncAccess {
 
         @Override
         public <A extends Runnable> A read(A run) {
-            return null;
+            run.run();
+            return run;
         }
     };
 
diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java
index 442d975f8..f08650f9d 100644
--- a/src/main/java/de/neemann/digital/gui/Main.java
+++ b/src/main/java/de/neemann/digital/gui/Main.java
@@ -978,10 +978,6 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
             public void actionPerformed(ActionEvent e) {
                 try {
                     model.doMicroStep(false);
-                    circuitComponent.removeHighLighted();
-                    modelCreator.addNodeElementsTo(model.nodesToUpdate(), circuitComponent.getHighLighted());
-                    circuitComponent.graphicHasChanged();
-                    checkMicroStepActions(model);
                 } catch (Exception e1) {
                     showErrorAndStopModel(Lang.get("msg_errorCalculatingStep"), e1);
                 }
@@ -992,10 +988,6 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
             public void actionPerformed(ActionEvent e) {
                 try {
                     model.runToBreakMicro();
-                    circuitComponent.removeHighLighted();
-                    modelCreator.addNodeElementsTo(model.nodesToUpdate(), circuitComponent.getHighLighted());
-                    circuitComponent.graphicHasChanged();
-                    checkMicroStepActions(model);
                 } catch (Exception e1) {
                     showErrorAndStopModel(Lang.get("msg_errorCalculatingStep"), e1);
                 }
@@ -1011,7 +1003,6 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
             public void actionPerformed(ActionEvent e) {
                 try {
                     Model.BreakInfo info = model.runToBreak();
-                    circuitComponent.graphicHasChanged();
                     statusLabel.setText(Lang.get("stat_clocks", info.getSteps(), info.getLabel()));
                 } catch (NodeException | RuntimeException e1) {
                     showErrorAndStopModel(Lang.get("msg_fastRunError"), e1);
@@ -1404,7 +1395,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
 
             modelCreator.connectToGui();
 
-            handleKeyboardComponent(updateEvent);
+            handleKeyboardComponents();
 
             doMicroStep.setEnabled(false);
             if (!realTimeClockRunning && model.isRunToBreakAllowed()) {
@@ -1457,17 +1448,11 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
             runToBreakMicroAction.setEnabled(needsUpdate);
     }
 
-    private void handleKeyboardComponent(ModelEvent updateEvent) {
+    private void handleKeyboardComponents() {
         KeyboardDialog.KeyPressedHandler handler = null;
         for (Keyboard k : model.findNode(Keyboard.class)) {
             if (handler == null)
-                if (updateEvent == ModelEvent.MICROSTEP)
-                    handler = keyboard -> {
-                        model.modify(keyboard::hasChanged);
-                        checkMicroStepActions(model);
-                    };
-                else
-                    handler = keyboard -> model.modify(keyboard::hasChanged);
+                handler = keyboard -> model.modify(keyboard::hasChanged);
 
             windowPosManager.register("keyboard_" + k.getLabel(), new KeyboardDialog(this, k, handler));
         }
@@ -1499,8 +1484,9 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
         // To avoid such problems a lock is used.
         synchronized (modelLock) {
             if (model != null) {
-                model.modify(() -> model.close());
+                Model m = model;
                 model = null;
+                m.modify(m::close);
                 SwingUtilities.invokeLater(() -> showErrorWithoutARunningModel(message, cause));
             }
         }
@@ -1727,8 +1713,10 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
                 case EXTERNALCHANGE:
                 case MICROSTEP:
                 case BREAK:
-                    if (!realTimeClockRunning)
+                    if (!realTimeClockRunning) {
+                        circuitComponent.removeHighLighted();
                         modelCreator.addNodeElementsTo(model.nodesToUpdate(), circuitComponent.getHighLighted());
+                    }
                     circuitComponent.graphicHasChanged();
                     if (!realTimeClockRunning)
                         checkMicroStepActions(model);
@@ -1863,7 +1851,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
                         try {
                             model.doStep();
                             if (clkVal.getBool()) {
-                                clkVal.setBool(!clkVal.getBool());
+                                model.modify(() -> clkVal.setBool(!clkVal.getBool()));
                                 model.doStep();
                             }
                             circuitComponent.graphicHasChanged();
diff --git a/src/test/java/de/neemann/digital/integration/TestInGUI.java b/src/test/java/de/neemann/digital/integration/TestInGUI.java
index 8d47e0c9f..5a267412b 100644
--- a/src/test/java/de/neemann/digital/integration/TestInGUI.java
+++ b/src/test/java/de/neemann/digital/integration/TestInGUI.java
@@ -434,7 +434,7 @@ public class TestInGUI extends TestCase {
                 .press("control typed a")
                 .typeTempFile("test")
                 .press("ENTER")
-                .delay(300)
+                .delay(600)
                 .add(new GuiTester.WaitFor(() -> {
                     Window activeWindow = FocusManager.getCurrentManager().getActiveWindow();
                     return !(activeWindow instanceof Main || activeWindow instanceof TableDialog);
@@ -915,7 +915,7 @@ public class TestInGUI extends TestCase {
                 .press("RIGHT", 1)
                 .press("DOWN", 1)
                 .press("ENTER", 1)
-                .press("control TAB", 4)
+                .press("control TAB", 7)
                 .press("RIGHT", 1)
                 .add(new GuiTester.SetFocusTo<>(AttributeDialog.class,
                         b -> b instanceof JButton && Lang.get("btn_edit").equals(((JButton) b).getText())))