diff --git a/src/drivers/win/main.cpp b/src/drivers/win/main.cpp
index 9a81efb9..862ad2c4 100644
--- a/src/drivers/win/main.cpp
+++ b/src/drivers/win/main.cpp
@@ -286,11 +286,20 @@ int BlockingCheck()
 		{
 			//other accelerator capable dialogs could be added here
 			extern HWND hwndMemWatch;
-			int accelerated = 0;
-			if(IsChild(hwndMemWatch,msg.hwnd))
-				accelerated = TranslateAccelerator(hwndMemWatch,fceu_hAccel,&msg);
+			int handled = 0;
+			if(hwndMemWatch)
+			{
+				if(IsChild(hwndMemWatch,msg.hwnd))
+					handled = TranslateAccelerator(hwndMemWatch,fceu_hAccel,&msg);
+				if(!handled)
+				{
+					int resylt = IsDialogMessage(hwndMemWatch,&msg);
+					handled = resylt;
+				}
+			}
 
-			if(!accelerated)
+
+			if(!handled)
 			{
 				TranslateMessage(&msg);
 				DispatchMessage(&msg);
diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index e1b5a4b0..b2a23b82 100644
Binary files a/src/drivers/win/res.rc and b/src/drivers/win/res.rc differ