diff --git a/src/drivers/win/main.cpp b/src/drivers/win/main.cpp
index 285c89f1..067210e7 100644
--- a/src/drivers/win/main.cpp
+++ b/src/drivers/win/main.cpp
@@ -53,6 +53,8 @@
 #include "cheat.h"
 #include "debug.h"
 #include "ntview.h"
+#include "ram_search.h"
+#include "ramwatch.h"
 #include "memview.h"
 #include "tracer.h"
 #include "cdlogger.h"
@@ -308,6 +310,20 @@ int BlockingCheck()
 				if(!handled)
 					handled = IsDialogMessage(hwndMemWatch,&msg);
 			}
+			if(RamSearchHWnd)
+			{
+				handled |= IsDialogMessage(RamSearchHWnd, &msg);
+			}
+			if(RamWatchHWnd)
+			{
+				if(IsDialogMessage(RamWatchHWnd, &msg))
+				{
+					if(msg.message == WM_KEYDOWN) // send keydown messages to the dialog (for accelerators, and also needed for the Alt key to work)
+						SendMessage(RamWatchHWnd, msg.message, msg.wParam, msg.lParam);
+					handled = true;
+				}
+			}
+
 			if(!handled && hwndTasEdit)
 			{
 				if(IsChild(hwndTasEdit,msg.hwnd))
diff --git a/src/drivers/win/ramwatch.cpp b/src/drivers/win/ramwatch.cpp
index cc0263c8..fec47752 100644
--- a/src/drivers/win/ramwatch.cpp
+++ b/src/drivers/win/ramwatch.cpp
@@ -1137,8 +1137,6 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
 			}
 			break;
 
-#if 0
-		// this message is never received
 		case WM_KEYDOWN: // handle accelerator keys
 		{
 			SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
@@ -1150,7 +1148,6 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
 			if(RamWatchAccels && TranslateAccelerator(hDlg, RamWatchAccels, &msg))
 				return true;
 		}	break;
-#endif
 
 //		case WM_CLOSE:
 //			RamWatchHWnd = NULL;