diff --git a/src/main/java/com/goodbird/cnpcgeckoaddon/client/gui/SubGuiModelAnimation.java b/src/main/java/com/goodbird/cnpcgeckoaddon/client/gui/SubGuiModelAnimation.java
index b9a7c46..0efc00b 100644
--- a/src/main/java/com/goodbird/cnpcgeckoaddon/client/gui/SubGuiModelAnimation.java
+++ b/src/main/java/com/goodbird/cnpcgeckoaddon/client/gui/SubGuiModelAnimation.java
@@ -9,9 +9,10 @@ import noppes.npcs.client.gui.util.*;
 import noppes.npcs.entity.EntityNPCInterface;
 import software.bernie.geckolib3.resource.GeckoLibCache;
 
-public class SubGuiModelAnimation extends SubGuiInterface implements ITextfieldListener {
+public class SubGuiModelAnimation extends SubGuiInterface implements ITextfieldListener, ISubGuiListener {
     public SubGuiModelAnimation(EntityNPCInterface npc){
         this.npc = npc;
+        closeOnEsc = true;
     }
 
     @Override
@@ -60,7 +61,7 @@ public class SubGuiModelAnimation extends SubGuiInterface implements ITextfieldL
         if(button.id==4){
             setSubGui(new GuiStringSelection(this,"Selecting geckolib attack animation:",
                 AnimationFileUtil.getAnimationList(getModelData(npc).getAnimFile()),
-                (name)-> getModelData(npc).setAnimFile(name)));
+                (name)-> getModelData(npc).setAttackAnim(name)));
         }
         if(button.id==5){
             setSubGui(new GuiStringSelection(this,"Selecting geckolib hurt animation:",
@@ -110,4 +111,9 @@ public class SubGuiModelAnimation extends SubGuiInterface implements ITextfieldL
                 textfield.setText(getModelData(npc).getHurtAnim());
         }
     }
+
+    @Override
+    public void subGuiClosed(SubGuiInterface subGuiInterface) {
+        initGui();
+    }
 }