diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index e2d0132288..163e1cf061 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -533,9 +533,6 @@ bool win32_load_content_from_gui(const char *szFilename)
       {
          const core_info_t *info = (const core_info_t*)&core_info[i];
 
-         if (!string_is_equal(info->systemname, current_core->systemname))
-            break;
-
          if (string_is_equal(path_get(RARCH_PATH_CORE), info->path))
          {
             /* Our previous core supports the current rom */
diff --git a/media/rarch.rc b/media/rarch.rc
index e758160872..932808ef1c 100644
--- a/media/rarch.rc
+++ b/media/rarch.rc
@@ -85,9 +85,9 @@ STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VIS
 CAPTION "Pick Core"
 FONT 8, "Ms Shell Dlg"
 {
-    PUSHBUTTON      "Cancel", IDCANCEL, 170, 32, 50, 14, 0, WS_EX_LEFT
-    DEFPUSHBUTTON   "OK", IDOK, 170, 15, 50, 14, 0, WS_EX_LEFT
     LISTBOX         ID_CORELISTBOX, 5, 55, 214, 60, WS_TABSTOP | WS_VSCROLL | LBS_NOINTEGRALHEIGHT | LBS_SORT | LBS_NOTIFY, WS_EX_LEFT
+    DEFPUSHBUTTON   "OK", IDOK, 170, 15, 50, 14, 0, WS_EX_LEFT
+    PUSHBUTTON      "Cancel", IDCANCEL, 170, 32, 50, 14, 0, WS_EX_LEFT
     LTEXT           "Please select a core to use for the content loaded.\nOtherwise, press 'Cancel' to cancel loading.", 0, 9, 12, 160, 17, SS_LEFT, WS_EX_LEFT
 }
 
diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c
index d5629fcbea..2c771ef916 100644
--- a/ui/drivers/ui_win32.c
+++ b/ui/drivers/ui_win32.c
@@ -645,10 +645,7 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
                   cmd         = CMD_EVENT_LOAD_CORE;
                   break;
                case ID_M_LOAD_CONTENT:
-                  if (win32_load_content_from_gui(win32_file))
-                  {
-                     do_wm_close = true;
-                  }
+                  win32_load_content_from_gui(win32_file);
                   break;
             }
          }