diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java
index 9e6df6db5..0eaaaf595 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java
@@ -41,11 +41,18 @@ public class SubGuiNpcCommand extends SubGuiInterface implements ITextfieldListe
         }
     }
 
+    @Override
+    public void close(){
+        if(getTextField(4) != null){
+            unFocused(getTextField(4));
+        }
+        super.close();
+    }
+
 	@Override
 	public void unFocused(GuiNpcTextField textfield) {
 		if(textfield.id == 4){
 			command = textfield.getText();
 		}
 	}
-
 }