diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java
index 27e5da0ec..069f81764 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java
@@ -219,6 +219,9 @@ public abstract class GuiNPCInterface extends GuiScreen {
     }
 
     public void close() {
+        if(GuiNpcTextField.activeTextfield != null)
+            GuiNpcTextField.unfocus();
+
         Keyboard.enableRepeatEvents(false);
         displayGuiScreen(null);
         mc.setIngameFocus();
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java
index 7c9f1d43e..190a03613 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface2.java
@@ -17,7 +17,7 @@ public abstract class GuiNPCInterface2 extends GuiNPCInterface {
         xSize = 420;
         ySize = 200;
         menu = new GuiNpcMenu(this, activeMenu, npc);
-
+        closeOnEsc = true;
     }
 
     @Override