diff --git a/changelog.txt b/changelog.txt
index 71ba94ea..c34e674f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,4 @@
+22-may-2009 - adelikat - win32 - Window caption shows the name of the ROM loaded
 22-may-2009 - adelikat - win32 - Hex Editor - allowed the user to customize the color scheme by use of RGB values stored in the .cfg file
 21-may-2009 - adelikat - win32 - reverted fixedFontHeight to 13 instead of 14.  Gave the option of adjusting the height by modifying RowHeightBorder in the .cfg file
 21-may-2009 - adelikat - win32 - made fullscreen toggle (Alt+Enter) remappable
diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp
index 55313a41..24a0c716 100644
--- a/src/drivers/win/window.cpp
+++ b/src/drivers/win/window.cpp
@@ -811,12 +811,14 @@ void CloseGame()
 		FCEUI_CloseGame();
 		KillMemView();
 		updateGameDependentMenus(GameInfo != 0);
+		SetWindowText(hAppWnd, FCEU_NAME_AND_VERSION);
 	}
 }
 
 void ALoad(char *nameo, char* innerFilename)
 {
 	if (GameInfo) FCEUI_CloseGame();
+
 	if(FCEUI_LoadGameVirtual(nameo, 1))
 	{
 		pal_emulation = FCEUI_GetCurrentVidSystem(0, 0);
@@ -844,7 +846,16 @@ void ALoad(char *nameo, char* innerFilename)
 		{
 			SetFSVideoMode();
 		}
+		
+		//Add the filename to the window caption
+		extern char FileBase[];
+		string str = FCEU_NAME_AND_VERSION;
+		str.append(": ");
+		str.append(FileBase);
+		SetWindowText(hAppWnd, str.c_str());
 	}
+	else
+		SetWindowText(hAppWnd, FCEU_NAME_AND_VERSION);	//adelikat: If game fails to load while a previous one was open, the previous would have been closed, so reflect that in the window caption
 
 	ParseGIInput(GameInfo);
 
@@ -1844,7 +1855,6 @@ int CreateMainWindow()
 		NULL );  
 
 	//CenterWindowOnScreen(hAppWnd);
-
 	DragAcceptFiles(hAppWnd, 1);
 
 	SetMainWindowStuff();