diff --git a/src/main/java/noppes/npcs/client/gui/GuiScript.java b/src/main/java/noppes/npcs/client/gui/GuiScript.java
index 78549fb9c..532baace5 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiScript.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiScript.java
@@ -89,8 +89,6 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall
 			addButton(new GuiNpcButton(101, guiLeft + 366, guiTop + 4, 50, 20, "gui.paste"));
 			addButton(new GuiNpcButton(100, guiLeft + 315, guiTop + 25, 50, 20, "gui.copy"));
 
-			addButton(new GuiNpcButton(108, guiLeft + 315, guiTop + 47, 80, 20, "gui.editor"));
-
 			addButton(new GuiNpcButton(107, guiLeft + 315, guiTop + 70, 80, 20, "script.loadscript"));
 
 			GuiCustomScroll scroll = new GuiCustomScroll(this, 0).setUnselectable();
@@ -217,13 +215,6 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall
 				script.setNPCScript(activeTab, container = new ScriptContainer(this.script));
 			setSubGui(new GuiScriptList(languages.get(script.scriptLanguage), container));
 		}
-		if (guibutton.id == 108) {
-			ScriptContainer container = script.getNPCScript(activeTab);
-			if(container != null){
-				setScript();
-				this.AWTWindow = new GuiJTextArea(container.script).setListener(this);
-			}
-		}
 	}
 
 	private void setScript(){
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
index 904f852ce..39e1395cf 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
@@ -1,8 +1,3 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
 package noppes.npcs.client.gui.script;
 
 import net.minecraft.client.gui.GuiButton;
@@ -296,15 +291,6 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
 
             this.setSubGui(new EventGuiScriptList((List)this.languages.get(this.handler.getLanguage()), container));
         }
-
-        if(guibutton.id == 108) {
-            container = (ScriptContainer)this.handler.getScripts().get(this.activeTab - 1);
-            if(container != null) {
-                this.setScript();
-                AWTWindow = new GuiJTextArea(container.script).setListener(this);
-            }
-        }
-
     }
 
     private void setScript() {
diff --git a/src/main/java/noppes/npcs/client/gui/swing/GuiJTextArea.java b/src/main/java/noppes/npcs/client/gui/swing/GuiJTextArea.java
index a71a34d71..19758bb50 100644
--- a/src/main/java/noppes/npcs/client/gui/swing/GuiJTextArea.java
+++ b/src/main/java/noppes/npcs/client/gui/swing/GuiJTextArea.java
@@ -1,5 +1,6 @@
 package noppes.npcs.client.gui.swing;
 
+import net.minecraft.client.Minecraft;
 import noppes.npcs.client.gui.util.IJTextAreaListener;
 import org.lwjgl.opengl.Display;
 
@@ -7,16 +8,16 @@ import javax.swing.*;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 
-public class GuiJTextArea extends JDialog implements WindowListener{
+public class GuiJTextArea extends JDialog implements WindowListener {
 	public IJTextAreaListener listener;
-	private JTextArea area;
+	private final JTextArea area;
 	public GuiJTextArea(String text){
 		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 		setSize(Display.getWidth() - 40, Display.getHeight() - 40);
 		setLocation(Display.getX() + 20, Display.getY() + 20);
 
-	    JScrollPane scroll = new JScrollPane(area = new JTextArea(text));
-	    scroll.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+		JScrollPane scroll = new JScrollPane(area = new JTextArea(text));
+		scroll.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
 		this.add(scroll);
 		this.addWindowListener(this);
 		setVisible(true);
@@ -40,8 +41,14 @@ public class GuiJTextArea extends JDialog implements WindowListener{
 
 	@Override
 	public void windowClosed(WindowEvent e) {
-		if(listener != null)
-			listener.saveText(area.getText());
+		if(listener == null)
+			return;
+		Minecraft.getMinecraft().func_152344_a(new Runnable() {
+			@Override
+			public void run() {
+				listener.saveText(area.getText());
+			}
+		});
 	}
 
 	@Override