diff --git a/core/src/mindustry/logic/LogicDialog.java b/core/src/mindustry/logic/LogicDialog.java
index ac2fd249a8..67ae4c40c7 100644
--- a/core/src/mindustry/logic/LogicDialog.java
+++ b/core/src/mindustry/logic/LogicDialog.java
@@ -228,11 +228,20 @@ public class LogicDialog extends BaseDialog{
     }
 
     public void show(String code, LExecutor executor, boolean privileged, Cons<String> modified){
+        show(code, executor, privileged, null, modified);
+    }
+
+    public void show(String code, LExecutor executor, boolean privileged, @Nullable Building build, Cons<String> modified){
         this.executor = executor;
         this.privileged = privileged;
         canvas.statements.clearChildren();
         canvas.rebuild();
         canvas.privileged = privileged;
+        update(() -> {
+            if(build != null && (!build.isValid() || !state.isGame())){
+                hide();
+            }
+        });
         try{
             canvas.load(code);
         }catch(Throwable t){
diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
index 7805e6830b..8920cd2526 100644
--- a/core/src/mindustry/world/blocks/logic/LogicBlock.java
+++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java
@@ -577,7 +577,7 @@ public class LogicBlock extends Block{
         @Override
         public void buildConfiguration(Table table){
             table.button(Icon.pencil, Styles.cleari, () -> {
-                ui.logic.show(code, executor, privileged, code -> configure(compress(code, relativeConnections())));
+                ui.logic.show(code, executor, privileged, this, code -> configure(compress(code, relativeConnections())));
             }).size(40);
         }