diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c
index 54d3653c9..d0e454508 100644
--- a/hw/xwin/winglobals.c
+++ b/hw/xwin/winglobals.c
@@ -60,7 +60,7 @@ Bool		g_fLogInited = FALSE;
 char *		g_pszCommandLine = NULL;
 Bool		g_fUseMsg = FALSE;
 DWORD		g_dwCurrentThreadID = 0;
-Bool		g_fKeyboardHookLL = TRUE;
+Bool		g_fKeyboardHookLL = FALSE;
 HHOOK		g_hhookKeyboardLL = NULL;
 
 
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index b90cfefd2..b57c6d267 100755
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -48,6 +48,7 @@ extern int			g_iLogVerbose;
 extern char *			g_pszLogFile;
 extern Bool			g_fXdmcpEnabled;
 extern char *			g_pszCommandLine;
+extern Bool			g_fKeyboardHookLL;
 
 
 /*
@@ -1107,6 +1108,18 @@ ddxProcessArgument (int argc, char *argv[], int i)
     }
 #endif
 
+  if (IS_OPTION ("-keyhook"))
+    {
+      g_fKeyboardHookLL = TRUE;
+      return 1;
+    }
+  
+  if (IS_OPTION ("-nokeyhook"))
+    {
+      g_fKeyboardHookLL = FALSE;
+      return 1;
+    }
+  
   return 0;
 }