diff --git a/changelog.txt b/changelog.txt
index 8721d756..8b06193d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,4 @@
+22-august-2009 - adelikat - Win32 - Map Hotkeys Dialog - Fixed but where "X" and Alt+F4 would not close dialog
 22-august-2009 - adelikat - Win32 - Added a Save Config File menu item
 12-august-2009 - adelikat - Win32 - Added a menu item to toggle to New PPU
 10-august-2009 - adelikat - fixed bug that caused new movies be created in /movie instead of /movies
diff --git a/src/drivers/win/mapinput.cpp b/src/drivers/win/mapinput.cpp
index 9c4ac19c..f046f405 100644
--- a/src/drivers/win/mapinput.cpp
+++ b/src/drivers/win/mapinput.cpp
@@ -693,7 +693,7 @@ BOOL CALLBACK MapInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 			PopulateMappingDisplay(hwndDlg);
 			break;
 		}
-
+		
 		switch(LOWORD(wParam))
 		{
 			case IDOK:
@@ -714,7 +714,12 @@ BOOL CALLBACK MapInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 				break;
 		}
 		break;
-
+		
+	case WM_CLOSE:
+	case WM_DESTROY:
+	case WM_QUIT:
+			EndDialog(hwndDlg, 0);
+			break;
 	case WM_NOTIFY:
 
 		switch(LOWORD(wParam))