diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java
index ea7343682..33e834dc0 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java
@@ -510,7 +510,6 @@ public class GuiNPCEditAnimation extends GuiModelInterface implements ITextfield
 
     @Override
     public void drawScreen(int par1, int par2, float par3) {
-        super.drawScreen(par1, par2, par3);
         AnimationData data = npc.display.animationData;
         if (!data.isActive() && this.playingAnimation) {
             this.playingAnimation = false;
@@ -518,6 +517,7 @@ public class GuiNPCEditAnimation extends GuiModelInterface implements ITextfield
         } else if (data.isActive()) {
             long time = mc.theWorld.getTotalWorldTime();
             if (time != prevTick) {
+                npc.display.animationData.increaseTime();
                 GuiNpcLabel label = this.getLabel(213);
                 if (label != null) {
                     label.label += ".";
@@ -529,6 +529,8 @@ public class GuiNPCEditAnimation extends GuiModelInterface implements ITextfield
             prevTick = time;
         }
 
+        super.drawScreen(par1, par2, par3);
+
         for (int i = 0; i < this.visibleFrames; i++) {
             if (getButton(300 + i) != null) {
                 GuiTexturedButton button = (GuiTexturedButton) getButton(300 + i);
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
index 381c12f8a..6ab69d319 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
@@ -104,8 +104,7 @@ public class GuiNPCManageAnimations extends GuiModelInterface2 implements IScrol
     }
 
     @Override
-    public void drawScreen(int par1, int par2, float par3) {
-        super.drawScreen(par1, par2, par3);
+    public void drawScreen(int par1, int par2, float partialTicks) {
         AnimationData data = npc.display.animationData;
         if (!data.isActive() && this.playingAnimation) {
             this.playingAnimation = false;
@@ -113,6 +112,7 @@ public class GuiNPCManageAnimations extends GuiModelInterface2 implements IScrol
         } else if (data.isActive()) {
             long time = mc.theWorld.getTotalWorldTime();
             if (time != prevTick) {
+                npc.display.animationData.increaseTime();
                 GuiNpcLabel label = this.getLabel(94);
                 if (label != null) {
                     label.label += ".";
@@ -123,6 +123,7 @@ public class GuiNPCManageAnimations extends GuiModelInterface2 implements IScrol
             }
             prevTick = time;
         }
+        super.drawScreen(par1, par2, partialTicks);
     }
 
     @Override