diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java
index 31877d3d..f7453ff4 100644
--- a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java
+++ b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java
@@ -116,6 +116,7 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
             // Add content
             GuiLabel label = new GuiLabel().setI18nText("replaymod.gui.renderqueue.jobname").setColor(Colors.BLACK);
             GuiTextField nameField = new GuiTextField().setSize(150, 20).setFocused(true);
+            nameField.setText(guiRenderSettings.getOutputFile().getName());
             popup.getInfo().addElements(new HorizontalLayout.Data(0.5), label, nameField);
             // Disable "Yes" button while name is empty
             nameField.onTextChanged(old -> popup.getYesButton().setEnabled(!nameField.getText().isEmpty())).onEnter(() -> {
@@ -123,7 +124,6 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
                     popup.getYesButton().onClick();
                 }
             });
-            popup.getYesButton().setDisabled();
             // Register callback
             Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
                 @Override
diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java b/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java
index e6d43fa9..8c1ee452 100644
--- a/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java
+++ b/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java
@@ -574,6 +574,10 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
         return new File(folder, fileName + "." + encodingPreset.getFileExtension());
     }
 
+    public File getOutputFile() {
+        return outputFile;
+    }
+
     protected File conformExtension(File file, RenderSettings.EncodingPreset preset) {
         String name = file.getName();
         if (name.contains(".")) {