diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 6f6ffd090..3eb2280bc 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -384,6 +384,10 @@ ifeq ($(VRAMDUMP), y)
 OPTS		+= -DENABLE_VRAM_DUMP
 RFLAGS		+= -DENABLE_VRAM_DUMP
 endif
+ifeq ($(NOHOOK), y)
+OPTS		+= -DNO_KEYBOARD_HOOK
+RFLAGS		+= -DNO_KEYBOARD_HOOK
+endif
 
 
 # Optional modules.
diff --git a/src/win/win_ui.c b/src/win/win_ui.c
index b2f01e215..ff405e128 100644
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -297,10 +297,12 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     switch (message) {
 	case WM_CREATE:
 		SetTimer(hwnd, TIMER_1SEC, 1000, NULL);
+#ifndef NO_KEYBOARD_HOOK
 		hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL,
 						 LowLevelKeyboardProc,
 						 GetModuleHandle(NULL), 0);
 		hook_enabled = 1;
+#endif
 		break;
 
 	case WM_COMMAND:
@@ -329,7 +331,9 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 				else
 					i = ui_msgbox_ex(MBX_QUESTION_YN, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL);
 				if (i == 0) {
+#ifndef NO_KEYBOARD_HOOK
 					UnhookWindowsHookEx(hKeyboardHook);
+#endif
 					KillTimer(hwnd, TIMER_1SEC);
 					PostQuitMessage(0);
 				}
@@ -697,7 +701,9 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		else
 			i = ui_msgbox_ex(MBX_QUESTION_YN, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL);
 		if (i == 0) {
+#ifndef NO_KEYBOARD_HOOK
 			UnhookWindowsHookEx(hKeyboardHook);
+#endif
 			KillTimer(hwnd, TIMER_1SEC);
 			PostQuitMessage(0);
 		}
@@ -705,7 +711,9 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		break;
 
 	case WM_DESTROY:
+#ifndef NO_KEYBOARD_HOOK
 		UnhookWindowsHookEx(hKeyboardHook);
+#endif
 		KillTimer(hwnd, TIMER_1SEC);
 		PostQuitMessage(0);
 		break;
@@ -746,7 +754,9 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		else
 			i = ui_msgbox_ex(MBX_QUESTION_YN, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL);
 		if (i == 0) {
+#ifndef NO_KEYBOARD_HOOK
 			UnhookWindowsHookEx(hKeyboardHook);
+#endif
 			KillTimer(hwnd, TIMER_1SEC);
 			PostQuitMessage(0);
 		}
@@ -776,6 +786,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
 	case WM_SETFOCUS:
 		infocus = 1;
+#ifndef NO_KEYBOARD_HOOK
 		if (! hook_enabled) {
 			hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL,
 							 LowLevelKeyboardProc,
@@ -783,15 +794,18 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 							 0);
 			hook_enabled = 1;
 		}
+#endif
 		break;
 
 	case WM_KILLFOCUS:
 		infocus = 0;
 		plat_mouse_capture(0);
+#ifndef NO_KEYBOARD_HOOK
 		if (hook_enabled) {
 			UnhookWindowsHookEx(hKeyboardHook);
 			hook_enabled = 0;
 		}
+#endif
 		break;
 
 	case WM_ENTERSIZEMOVE:
@@ -1276,6 +1290,7 @@ input_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		break;
 	case WM_SETFOCUS:
 		infocus = 1;
+#ifndef NO_KEYBOARD_HOOK
 		if (! hook_enabled) {
 			hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL,
 							 LowLevelKeyboardProc,
@@ -1283,15 +1298,18 @@ input_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 							 0);
 			hook_enabled = 1;
 		}
+#endif
 		break;
 
 	case WM_KILLFOCUS:
 		infocus = 0;
 		plat_mouse_capture(0);
+#ifndef NO_KEYBOARD_HOOK
 		if (hook_enabled) {
 			UnhookWindowsHookEx(hKeyboardHook);
 			hook_enabled = 0;
 		}
+#endif
 		break;
 
 	case WM_LBUTTONUP: