diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySaving.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySaving.java
index 46760ab4..77693c9e 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySaving.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySaving.java
@@ -1,5 +1,6 @@
 package eu.crushedpixel.replaymod.gui;
 
+import eu.crushedpixel.replaymod.ReplayMod;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
@@ -14,6 +15,7 @@ public class GuiReplaySaving extends GuiScreen {
 
     public GuiReplaySaving(GuiScreen waiting) {
         this.waiting = waiting;
+        ReplayMod.replayFileAppender.addFinishListener(this);
     }
 
     @Override
diff --git a/src/main/java/eu/crushedpixel/replaymod/registry/ReplayFileAppender.java b/src/main/java/eu/crushedpixel/replaymod/registry/ReplayFileAppender.java
index 4d20a385..35c6c6bb 100644
--- a/src/main/java/eu/crushedpixel/replaymod/registry/ReplayFileAppender.java
+++ b/src/main/java/eu/crushedpixel/replaymod/registry/ReplayFileAppender.java
@@ -29,7 +29,6 @@ public class ReplayFileAppender extends Thread {
                 @Override
                 public void run() {
                     final GuiReplaySaving savingScreen = new GuiReplaySaving(null);
-                    addFinishListener(savingScreen);
 
                     Minecraft.getMinecraft().displayGuiScreen(savingScreen);
                 }