diff --git a/Gui/win32/dialogs.c b/Gui/win32/dialogs.c
index abfeedcb56..e954d93e7e 100644
--- a/Gui/win32/dialogs.c
+++ b/Gui/win32/dialogs.c
@@ -143,7 +143,7 @@ int display_openfilewindow(gui_t *gui, int add)
             {
                 if (GetFullPathName(filename, MAX_PATH, filename, &filepart))
                 {
-                    if(!parse_filename(filename, playtree, mconfig, add? 0 : 1))
+                    if(!parse_filename(filename, playtree, mconfig, 0))
                         gui->playlist->add_track(gui->playlist, filename, NULL, filepart, 0);
                     mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] Adding file: %s - path %s\n", filespec, filename);
                     result++;
diff --git a/Gui/win32/gui.c b/Gui/win32/gui.c
index 473606cc1e..fe018d422f 100644
--- a/Gui/win32/gui.c
+++ b/Gui/win32/gui.c
@@ -181,6 +181,7 @@ static void handlemsg(HWND hWnd, int msg)
         case evLoadPlay:
         case evLoad:
             if(display_openfilewindow(gui, 0) && (msg == evLoadPlay))
+                mplGotoTheNext = guiIntfStruct.Playing? 0 : 1;
                 handlemsg(hWnd, evDropFile);
             return;
         case evLoadSubtitle: