diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java
index 7fb11cac..15720db4 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java
@@ -83,6 +83,10 @@ public class GLWindow extends DropTarget {
 
     }
 
+    public JFrame getFrame() {
+        return frame;
+    }
+
     private void open() throws LWJGLException {
         // Dimensions from LWJGL may have a non 1:1 scale on high DPI monitors.
         int x = getScaledPixelUnit(Display.getX());
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
index fcb76eb0..18f5c277 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
@@ -260,7 +260,7 @@ public class GuiSkins extends GuiScreen implements FutureCallback<SkinUploadResp
                     this.selectedSkin = null;
                     this.localPlayer.releaseTextures();
                     this.openFileThread = new ThreadOpenFilePNG(this.mc, I18n.format("hdskins.open.title"), this::onFileOpenDialogClosed);
-                    this.openFileThread.start();
+                    this.openFileThread.setParent(GLWindow.current().getFrame()).start();
                     guiButton.enabled = false;
                 }
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java
index 7735c96a..df2005c3 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java
@@ -2,17 +2,10 @@ package com.voxelmodpack.hdskins.upload.awt;
 
 import net.minecraft.client.Minecraft;
 
-import java.awt.AWTEvent;
-import java.awt.event.MouseEvent;
-
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.filechooser.FileFilter;
 
-import org.lwjgl.opengl.Display;
-
-import com.voxelmodpack.hdskins.Later;
-
 /**
  * Base class for "open file" dialog threads
  *
@@ -41,35 +34,19 @@ public abstract class ThreadOpenFile extends Thread {
         this.dialogTitle = dialogTitle;
     }
 
-    @Override
-    public void start() {
-        Later.performLater(0, this);
-    }
-
     public ThreadOpenFile setParent(JFrame parent) {
         this.parent = parent;
-        this.parent.setAlwaysOnTop(true);
-
         return this;
     }
 
     @Override
     public void run() {
-        if (parent == null) {
-            parent = new JFrame("InternalDialog");
-            parent.setAlwaysOnTop(true);
-        }
-
-        parent.requestFocusInWindow();
-        parent.setVisible(false);
-
         fileDialog = new JFileChooser();
         fileDialog.setDialogTitle(this.dialogTitle);
         fileDialog.setFileFilter(this.getFileFilter());
 
         int dialogResult = fileDialog.showOpenDialog(parent);
 
-        parent.setVisible(true);
         this.parentScreen.onFileOpenDialogClosed(fileDialog, dialogResult);
     }