diff --git a/Source/Project64/UserInterface/GuiClass.cpp b/Source/Project64/UserInterface/GuiClass.cpp
index 0239207d9..288e03147 100644
--- a/Source/Project64/UserInterface/GuiClass.cpp
+++ b/Source/Project64/UserInterface/GuiClass.cpp
@@ -1142,7 +1142,36 @@ LRESULT CALLBACK CMainGui::MainGui_Proc(HWND hWnd, DWORD uMsg, DWORD wParam, DWO
         DragQueryFile(hDrop, 0, filename, sizeof(filename));
         DragFinish(hDrop);
 
-        CN64System::RunFileImage(filename);
+        if (!CN64System::RunFileImage(filename))
+        {
+            // Open Disk
+            if (CN64System::RunDiskImage(filename))
+            {
+                stdstr IPLROM = g_Settings->LoadStringVal(File_DiskIPLPath);
+                if ((IPLROM.length() <= 0) || (!CN64System::RunFileImage(IPLROM.c_str())))
+                {
+                    // Open DDROM
+                    OPENFILENAME openfilename;
+                    char FileName[_MAX_PATH], Directory[_MAX_PATH];
+                    memset(&FileName, 0, sizeof(FileName));
+                    memset(&openfilename, 0, sizeof(openfilename));
+
+                    strcpy(Directory, g_Settings->LoadStringVal(Directory_Game).c_str());
+                    openfilename.lStructSize = sizeof(openfilename);
+                    openfilename.hwndOwner = (HWND)hWnd;
+                    openfilename.lpstrFilter = "64DD IPL ROM Image (*.zip, *.7z, *.?64, *.rom, *.usa, *.jap, *.pal, *.bin)\0*.?64;*.zip;*.7z;*.bin;*.rom;*.usa;*.jap;*.pal\0All files (*.*)\0*.*\0";
+                    openfilename.lpstrFile = FileName;
+                    openfilename.lpstrInitialDir = Directory;
+                    openfilename.nMaxFile = MAX_PATH;
+                    openfilename.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
+
+                    if (GetOpenFileName(&openfilename))
+                    {
+                        CN64System::RunFileImage(FileName);
+                    }
+                }
+            }
+        }
     }
     break;
     case WM_DESTROY: