diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java b/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java
index f719b649b..89254ce2d 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java
@@ -6,12 +6,13 @@ import noppes.npcs.controllers.data.Frame;
 
 public class SubGuiAnimationFrame extends SubGuiInterface implements ITextfieldListener {
     private final Frame editingFrame;
-    
+
     public SubGuiAnimationFrame(Frame editingFrame) {
         this.editingFrame = editingFrame;
         setBackground("smallbg.png");
+        this.closeOnEsc = true;
     }
-    
+
     @Override
     public void initGui() {
         super.initGui();
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiAnimationOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiAnimationOptions.java
index 4a0724644..5a021a406 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiAnimationOptions.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiAnimationOptions.java
@@ -12,6 +12,7 @@ public class SubGuiAnimationOptions extends SubGuiInterface {
     public SubGuiAnimationOptions(Animation animation) {
         this.animation = animation;
         setBackground("smallbg.png");
+        this.closeOnEsc = true;
     }
 
     @Override