diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index c224b2769..346750951 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -1369,7 +1369,8 @@ BOOL LoadROM(char * filename, const char *cflash_disk_image)
 		UpdateRecentRoms(filename);
 		osd->setRotate(GPU_rotation);
 		if (AutoRWLoad)		//Open Ram Watch if its auto-load setting is checked
-				RamWatchHWnd = CreateDialog(hAppInst, MAKEINTRESOURCE(IDD_RAMWATCH), MainWindow->getHWnd(), (DLGPROC) RamWatchProc);
+			OpenRWRecentFile(0);	
+			RamWatchHWnd = CreateDialog(hAppInst, MAKEINTRESOURCE(IDD_RAMWATCH), MainWindow->getHWnd(), (DLGPROC) RamWatchProc);
 		
 		return TRUE;		
 	}
diff --git a/desmume/src/windows/ramwatch.cpp b/desmume/src/windows/ramwatch.cpp
index a3d7ea70e..e2c38be3b 100644
--- a/desmume/src/windows/ramwatch.cpp
+++ b/desmume/src/windows/ramwatch.cpp
@@ -940,11 +940,7 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
 
 			// due to some bug in windows, the arrow button width from the resource gets ignored, so we have to set it here
 			SetWindowPos(GetDlgItem(hDlg,ID_WATCHES_UPDOWN), 0,0,0, 30,60, SWP_NOMOVE);
-			
-			if (AutoRWLoad) OpenRWRecentFile(0);
-			
 			Update_RAM_Watch();
-
 			DragAcceptFiles(hDlg, TRUE);
 
 			return true;