diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java
index 1be012f3..41f95a88 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java
@@ -62,7 +62,10 @@ public abstract class SimulatorBaseGui {
                 player.getOpenInventory().setTitle(title());
             }
             populate();
-            inventory.open();
+            if (player.getOpenInventory().getTopInventory() == inv) {
+                inventory.open();
+                SimulatorWatcher.watch(player, simulator, this::open);
+            }
             return;
         }